update to 0.85.0

- adjust license, as upstream changed it to MIT
- update make-git-snapshot.sh to current locations and scheme
- drop common package, not needed anymore
- compositor is now in a separate package, hence reduce BuildRequires to what
  is actually needed (a lot less) and adjust summary
- make usage of a git checkout in spec file optional
- a %{?_isa} to requires where it makes sense

make-git-snapshot.sh

@@ -6,6 +6,7 @@
 # Point env var REF to a local repo to reduce clone time.
 
 DIRNAME=wayland-$( date +%Y%m%d )
+REPO=wayland
 
 echo REF ${REF:+--reference $REF}
 echo DIRNAME $DIRNAME
@@ -14,9 +15,8 @@ echo HEAD ${1:-HEAD}
 rm -rf $DIRNAME
 
 git clone ${REF:+--reference $REF} \
-	git://git.freedesktop.org/git/wayland $DIRNAME
+	git://git.freedesktop.org/git/wayland/${REPO}/ $DIRNAME/${REPO}/
-
+GIT_DIR=$DIRNAME/${REPO}/.git git archive --format=tar --prefix=${REPO}-${DIRNAME#wayland-}/ ${1:-HEAD} \
-GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| bzip2 > ${REPO}-${DIRNAME#wayland-}.tar.bz2
-	| bzip2 > $DIRNAME.tar.bz2
 
 # rm -rf $DIRNAME

sources

@@ -1 +0,0 @@
-e51f1639ee2e6245d2761e6532d508b3  wayland-20101221.tar.bz2

wayland.spec

@@ -1,26 +1,26 @@
-%global gitdate 20101221
+#global gitdate 20120217
 
 Name:           wayland
-Version:        0.1
+Version:        0.85.0
-Release:        0.6%{?gitdate:.%{gitdate}}%{?dist}
+Release:        1%{?gitdate:.%{gitdate}}%{?dist}
-Summary:        Wayland compositor
+Summary:        Wayland Compositor Infrastructure
 
 Group:          User Interface/X
-License:        GPLv2+
+License:        MIT
 URL:            http://%{name}.freedesktop.org/
+%if 0%{?gitdate}
 Source0:        wayland-%{gitdate}.tar.bz2
-Source1:	make-git-snapshot.sh
+%else
-Patch0:         wayland-no-clients.patch
+Source0:        http://cgit.freedesktop.org/wayland/wayland/snapshot/%{name}-%{version}.tar.gz
+%endif
+Source1:        make-git-snapshot.sh
 
 BuildRequires:  autoconf automake libtool
-BuildRequires:  pkgconfig(glesv2) pkgconfig(egl) pkgconfig(libffi)
+BuildRequires:  pkgconfig(libffi)
-BuildRequires:  pkgconfig(gl) pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(gdk-pixbuf-2.0) pkgconfig(libudev) >= 136
-BuildRequires:  pkgconfig(libdrm) pkgconfig(xcb-dri2) pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(poppler-glib) pkgconfig(gdk-2.0)
 BuildRequires:  expat-devel
-#BuildRequires: pkgconfig(cairo-gl)
+
-Requires:       wayland-common = %{version}-%{release}
+Provides:       %{name}-common = %{version}-%{release}
+Obsoletes:      %{name}-common < 0.85.0
 
 %description
 Wayland is a protocol for a compositor to talk to its clients as well as a C
@@ -29,12 +29,6 @@ display server running on Linux kernel modesetting and evdev input devices,
 an X application, or a wayland client itself. The clients can be traditional
 applications, X servers (rootless or fullscreen) or other display servers.
 
-%package common
-Summary: Common data files for wayland
-License: CC-BY-SA
-%description common
-Common data files for wayland
-
 %package devel
 Summary: Common headers for wayland
 License: MIT
@@ -56,22 +50,22 @@ Wayland server library
 %package -n libwayland-client-devel
 Summary: Headers and symlinks for developing wayland client applications
 License: MIT
-Requires: libwayland-client = %{version}-%{release}
+Requires: libwayland-client%{?_isa} = %{version}-%{release}
-Requires: wayland-devel = %{version}-%{release}
+Requires: wayland-devel%{?_isa} = %{version}-%{release}
 %description -n libwayland-client-devel
 Headers and symlinks for developing wayland client applications.
 
 %package -n libwayland-server-devel
 Summary: Headers and symlinks for developing wayland server applications
 License: MIT
-Requires: libwayland-server = %{version}-%{release}
+Requires: libwayland-server%{?_isa} = %{version}-%{release}
-Requires: wayland-devel = %{version}-%{release}
+Requires: wayland-devel%{?_isa} = %{version}-%{release}
 %description -n libwayland-server-devel
 Headers and symlinks for developing wayland server applications.
 
 %prep
-%setup -q -n %{name}-%{gitdate}
+%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch0 -p1 -b .no-clients
+rm spec/.gitignore
 
 %build
 autoreconf -v --install
@@ -83,9 +77,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-libtool --mode=install install -m 0755 compositor/compositor $RPM_BUILD_ROOT%{_bindir}
-
 find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 
 %clean
@@ -100,18 +91,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README
+%doc README TODO spec
-%{_bindir}/compositor
-%{_sysconfdir}/udev/rules.d/*.rules
-
-%files common
-%defattr(-,root,root,-)
-%doc data/COPYING
-%{_datadir}/wayland
 
 %files devel
 %defattr(-,root,root,-)
+%{_bindir}/wayland-scanner
 %{_includedir}/wayland-util.h
+%{_includedir}/wayland-egl.h
+%{_datadir}/aclocal/wayland-scanner.m4
+%{_datadir}/aclocal/wayland-scanner.mk
 
 %files -n libwayland-client
 %defattr(-,root,root,-)
@@ -125,13 +113,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_includedir}/wayland-client*.h
 %{_libdir}/libwayland-client.so
+%{_libdir}/pkgconfig/wayland-client.pc
 
 %files -n libwayland-server-devel
 %defattr(-,root,root,-)
 %{_includedir}/wayland-server*.h
 %{_libdir}/libwayland-server.so
+%{_libdir}/pkgconfig/wayland-server.pc
 
 %changelog
+* Sat Feb 18 2012 Thorsten Leemhuis <fedora@leemhuis.info> - 0.85.0-1
+- update to 0.85.0
+- adjust license, as upstream changed it to MIT
+- update make-git-snapshot.sh to current locations and scheme
+- drop common package, not needed anymore
+- compositor is now in a separate package, hence reduce BuildRequires to what
+  is actually needed (a lot less) and adjust summary
+- make usage of a git checkout in spec file optional
+- a %%{?_isa} to requires where it makes sense
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1-0.6.20101221
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild