diff --git a/.cvsignore b/.cvsignore index 01e7de8..f813cc8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -28,3 +28,4 @@ xineramaproto-1.1.2.tar.bz2 xproto-7.0.5.tar.bz2 xproxymanagementprotocol-1.0.2.tar.bz2 glproto-1.4.7.tar.bz2 +xproto-7.0.7.tar.bz2 diff --git a/sources b/sources index 4c51192..6ca7995 100644 --- a/sources +++ b/sources @@ -6,6 +6,7 @@ d80acad88411e7944b9b085463d53302 dmxproto-2.2.2.tar.bz2 8b298cc3424597f8138c7faf7763dce9 fixesproto-4.0.tar.bz2 60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2 c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2 +e4b1c5a323149d97f29434e5ace921c8 glproto-1.4.7.tar.bz2 e0b7df0fc69f0712aa7f2161faa94e1d inputproto-1.3.2.tar.bz2 3ae193c317a3621966c3c53d83a254f4 kbproto-1.0.2.tar.bz2 0f4e7982c6d4ec3b2cf38502dd1293a3 printproto-1.0.3.tar.bz2 @@ -25,6 +26,5 @@ acae8edeb05a406f7f60bcbb218a8f1d xf86miscproto-0.9.2.tar.bz2 b6a96ffdae084e27487a58314008b000 xf86rushproto-1.1.2.tar.bz2 f00844a63d6e76b69eb0eb5e41eed843 xf86vidmodeproto-2.2.2.tar.bz2 1cc292c562962ad0ad3a253cae68c632 xineramaproto-1.1.2.tar.bz2 -7ebf5b845817a867f2e4bdcabc33a257 xproto-7.0.5.tar.bz2 +d0b9334f2cde90ad19ff94038395347d xproto-7.0.7.tar.bz2 d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2 -e4b1c5a323149d97f29434e5ace921c8 glproto-1.4.7.tar.bz2 diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec index 464df83..f97aadf 100644 --- a/xorg-x11-proto-devel.spec +++ b/xorg-x11-proto-devel.spec @@ -10,48 +10,45 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.1 -Release: 1 +Release: 2 License: The Open Group License Group: Development/System URL: http://www.x.org -%define sourceurl http://xorg.freedesktop.org/releases/individual/proto -Source0: %{sourceurl}/bigreqsproto-1.0.2.tar.bz2 -Source1: %{sourceurl}/compositeproto-0.3.1.tar.bz2 -Source2: %{sourceurl}/damageproto-1.0.3.tar.bz2 -Source3: %{sourceurl}/dmxproto-2.2.2.tar.bz2 -Source4: %{sourceurl}/evieext-1.0.2.tar.bz2 -Source5: %{sourceurl}/fixesproto-4.0.tar.bz2 -Source6: %{sourceurl}/fontcacheproto-0.1.2.tar.bz2 -Source7: %{sourceurl}/fontsproto-2.0.2.tar.bz2 -Source8: %{sourceurl}/glproto-1.4.7.tar.bz2 -Source9: %{sourceurl}/inputproto-1.3.2.tar.bz2 -Source10: %{sourceurl}/kbproto-1.0.2.tar.bz2 -# NOTE: What once was known as PanoramiX, is now known as Xinerama -#Source11: %{sourceurl}/panoramixproto-1.1.tar.bz2 -Source12: %{sourceurl}/printproto-1.0.3.tar.bz2 -Source13: %{sourceurl}/randrproto-1.1.2.tar.bz2 -Source14: %{sourceurl}/recordproto-1.13.2.tar.bz2 -Source15: %{sourceurl}/renderproto-0.9.2.tar.bz2 -Source16: %{sourceurl}/resourceproto-1.0.2.tar.bz2 -Source17: %{sourceurl}/scrnsaverproto-1.1.0.tar.bz2 -Source18: %{sourceurl}/trapproto-3.4.3.tar.bz2 -Source19: %{sourceurl}/videoproto-2.2.2.tar.bz2 -Source20: %{sourceurl}/xcmiscproto-1.1.2.tar.bz2 -Source21: %{sourceurl}/xextproto-7.0.2.tar.bz2 -Source22: %{sourceurl}/xf86bigfontproto-1.1.2.tar.bz2 -Source23: %{sourceurl}/xf86dgaproto-2.0.2.tar.bz2 -Source24: %{sourceurl}/xf86driproto-2.0.3.tar.bz2 -Source25: %{sourceurl}/xf86miscproto-0.9.2.tar.bz2 -Source26: %{sourceurl}/xf86rushproto-1.1.2.tar.bz2 -Source27: %{sourceurl}/xf86vidmodeproto-2.2.2.tar.bz2 -Source28: %{sourceurl}/xineramaproto-1.1.2.tar.bz2 -Source29: %{sourceurl}/xproto-7.0.5.tar.bz2 -Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2 - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.0.2.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.3.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.0.3.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/individual/proto/evieext-1.0.2.tar.bz2 +Source5: http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.0.tar.bz2 +Source6: http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.2.tar.bz2 +Source7: http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.0.2.tar.bz2 +Source8: http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.7.tar.bz2 +Source9: http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.3.2.tar.bz2 +Source10: http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.2.tar.bz2 +Source12: http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.3.tar.bz2 +Source13: http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.1.2.tar.bz2 +Source14: http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.13.2.tar.bz2 +Source15: http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.2.tar.bz2 +Source16: http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.0.2.tar.bz2 +Source17: http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.1.0.tar.bz2 +Source18: http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2 +Source19: http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.2.2.tar.bz2 +Source20: http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.1.2.tar.bz2 +Source21: http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.2.tar.bz2 +Source22: http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.1.2.tar.bz2 +Source23: http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.2.tar.bz2 +Source24: http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.0.3.tar.bz2 +Source25: http://xorg.freedesktop.org/releases/individual/proto/xf86miscproto-0.9.2.tar.bz2 +Source26: http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2 +Source27: http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2 +Source28: http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.1.2.tar.bz2 +Source29: http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.7.tar.bz2 +Source30: http://xorg.freedesktop.org/releases/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2 + BuildRequires: pkgconfig -BuildRequires: xorg-x11-util-macros +BuildRequires: xorg-x11-util-macros >= 1.0.2-1 # FIXME: This buildreq on xorg-x11-filesystem isn't really necessary, and # can be removed in the future. The main purpose of it being here right # now, is to force buildmachines to get updated to solve the dir/symlink @@ -90,7 +87,7 @@ done rm -rf $RPM_BUILD_ROOT for dir in $(ls -1) ; do pushd $dir - %makeinstall + make install DESTDIR=$RPM_BUILD_ROOT popd done @@ -278,6 +275,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xproxymngproto.pc %changelog +* Wed Jun 21 2006 Mike A. Harris 7.1-2 +- Update to xproto 7.0.7 for X11R7.1 +- Use "make install" instead of makeinstall macro. + * Thu May 25 2006 Mike A. Harris 7.1-1 - Bump package version-release to 7.1-1 for X.Org X11R7.1 release. @@ -287,10 +288,10 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 27 2006 Adam Jackson 7.0-12 - Update to xproto 7.0.5 for misc fixes -* Fri Apr 7 2006 Adam Jackson 7.0-10 +* Fri Apr 07 2006 Adam Jackson 7.0-10 - Update to compositeproto-0.3.1 to fix big-endian LP64. -* Sat Apr 1 2006 Adam Jackson 7.0-9 +* Sat Apr 01 2006 Adam Jackson 7.0-9 - Update to scrnsaverproto-1.1 * Mon Mar 20 2006 Adam Jackson 7.0-8 @@ -333,7 +334,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 15 2005 Mike A. Harris 0.99.4-1 - Update all proto tarballs to the RC4 release. -* Wed Dec 7 2005 Mike A. Harris 0.99.3-1 +* Wed Dec 07 2005 Mike A. Harris 0.99.3-1 - Update to printproto-1.0.2, trapproto-3.4.2, xproto-7.0.3 from the X11R7 RC3 release. @@ -358,7 +359,7 @@ rm -rf $RPM_BUILD_ROOT - Remove glu.h and glx.h from file manifest, as they're provided by Mesa. - Added {_includedir}/GL/internal/dri_interface.h to file manifest. -* Sun Oct 2 2005 Mike A. Harris 0.0.1-3 +* Sun Oct 02 2005 Mike A. Harris 0.0.1-3 - Use Fedora-Extras style BuildRoot - Invoke make with _smp_mflags - Add full URLs to SourceN lines