Update to a git snapshot based on 0.89.0
This commit is contained in:
parent
74cc935c36
commit
95b1d7ea4b
@ -1,18 +0,0 @@
|
|||||||
diff -up wayland-20101123/compositor/Makefile.am.jx wayland-20101123/compositor/Makefile.am
|
|
||||||
--- wayland-20101123/compositor/Makefile.am.jx 2010-11-22 21:54:15.000000000 -0500
|
|
||||||
+++ wayland-20101123/compositor/Makefile.am 2010-11-23 10:46:02.000000000 -0500
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-noinst_PROGRAMS = compositor
|
|
||||||
+bin_PROGRAMS = compositor
|
|
||||||
|
|
||||||
INCLUDES = \
|
|
||||||
-I$(top_srcdir)/wayland \
|
|
||||||
@@ -22,7 +22,7 @@ compositor_SOURCES = \
|
|
||||||
drm.c \
|
|
||||||
shm.c
|
|
||||||
|
|
||||||
-udevdir = $(sysconfdir)/udev
|
|
||||||
+udevdir = $(sysconfdir)/udev/rules.d
|
|
||||||
|
|
||||||
dist_udev_DATA = \
|
|
||||||
70-wayland.rules
|
|
@ -1,18 +0,0 @@
|
|||||||
diff -up wayland-20101111/configure.ac.jx wayland-20101111/configure.ac
|
|
||||||
--- wayland-20101111/configure.ac.jx 2010-11-10 08:42:17.000000000 -0500
|
|
||||||
+++ wayland-20101111/configure.ac 2010-11-11 17:12:56.000000000 -0500
|
|
||||||
@@ -57,6 +57,5 @@ AC_CONFIG_FILES([wayland/wayland-server.
|
|
||||||
Makefile
|
|
||||||
wayland/Makefile
|
|
||||||
compositor/Makefile
|
|
||||||
- clients/Makefile
|
|
||||||
data/Makefile])
|
|
||||||
AC_OUTPUT
|
|
||||||
diff -up wayland-20101111/Makefile.am.jx wayland-20101111/Makefile.am
|
|
||||||
--- wayland-20101111/Makefile.am.jx 2010-11-10 08:42:17.000000000 -0500
|
|
||||||
+++ wayland-20101111/Makefile.am 2010-11-11 17:13:07.000000000 -0500
|
|
||||||
@@ -1,3 +1,3 @@
|
|
||||||
-SUBDIRS = wayland compositor clients data
|
|
||||||
+SUBDIRS = wayland compositor data
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
|
12
wayland.spec
12
wayland.spec
@ -1,7 +1,7 @@
|
|||||||
#global gitdate 20120217
|
%global gitdate 20120424
|
||||||
|
|
||||||
Name: wayland
|
Name: wayland
|
||||||
Version: 0.85.0
|
Version: 0.89.0
|
||||||
Release: 1%{?gitdate:.%{gitdate}}%{?dist}
|
Release: 1%{?gitdate:.%{gitdate}}%{?dist}
|
||||||
Summary: Wayland Compositor Infrastructure
|
Summary: Wayland Compositor Infrastructure
|
||||||
|
|
||||||
@ -18,6 +18,7 @@ Source1: make-git-snapshot.sh
|
|||||||
BuildRequires: autoconf automake libtool
|
BuildRequires: autoconf automake libtool
|
||||||
BuildRequires: pkgconfig(libffi)
|
BuildRequires: pkgconfig(libffi)
|
||||||
BuildRequires: expat-devel
|
BuildRequires: expat-devel
|
||||||
|
BuildRequires: libxslt
|
||||||
|
|
||||||
Provides: %{name}-common = %{version}-%{release}
|
Provides: %{name}-common = %{version}-%{release}
|
||||||
Obsoletes: %{name}-common < 0.85.0
|
Obsoletes: %{name}-common < 0.85.0
|
||||||
@ -69,7 +70,7 @@ rm spec/.gitignore
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -v --install
|
autoreconf -v --install
|
||||||
%configure --disable-static
|
%configure --disable-static --enable-documentation
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|
||||||
@ -92,12 +93,14 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc README TODO spec
|
%doc README TODO spec
|
||||||
|
%doc %{_datadir}/doc/wayland/*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}/wayland-scanner
|
%{_bindir}/wayland-scanner
|
||||||
%{_includedir}/wayland-util.h
|
%{_includedir}/wayland-util.h
|
||||||
%{_includedir}/wayland-egl.h
|
%{_includedir}/wayland-egl.h
|
||||||
|
%{_includedir}/wayland-version.h
|
||||||
%{_datadir}/aclocal/wayland-scanner.m4
|
%{_datadir}/aclocal/wayland-scanner.m4
|
||||||
%{_datadir}/aclocal/wayland-scanner.mk
|
%{_datadir}/aclocal/wayland-scanner.mk
|
||||||
|
|
||||||
@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pkgconfig/wayland-server.pc
|
%{_libdir}/pkgconfig/wayland-server.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 24 2012 Richard Hughes <rhughes@redhat.com> - 0.89.0-1
|
||||||
|
- Update to a git snapshot based on 0.89.0
|
||||||
|
|
||||||
* Sat Feb 18 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 0.85.0-1
|
* Sat Feb 18 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 0.85.0-1
|
||||||
- update to 0.85.0
|
- update to 0.85.0
|
||||||
- adjust license, as upstream changed it to MIT
|
- adjust license, as upstream changed it to MIT
|
||||||
|
Loading…
Reference in New Issue
Block a user