diff --git a/.cvsignore b/.cvsignore index 2baf6fb..282c91e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXdamage-1.0.4.tar.bz2 +libXdamage-1.1.tar.bz2 diff --git a/libXdamage.spec b/libXdamage.spec index ce3f4cc..1ad5edd 100644 --- a/libXdamage.spec +++ b/libXdamage.spec @@ -1,8 +1,8 @@ Summary: X.Org X11 libXdamage runtime library Name: libXdamage -Version: 1.0.4 -Release: 1 -License: MIT/X11 +Version: 1.1 +Release: 1%{?dist} +License: MIT Group: System Environment/Libraries URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -11,8 +11,8 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: pkgconfig BuildRequires: libX11-devel -# NOTE: Needs damageproto >= 1.0 -BuildRequires: xorg-x11-proto-devel >= 7.0-1 +# damageproto 1.1. should probably turn those into virtual provides... +BuildRequires: xorg-x11-proto-devel >= 7.2-3 BuildRequires: libXfixes-devel Obsoletes: XFree86-libs, xorg-x11-libs @@ -27,7 +27,7 @@ Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} # xdamage.pc Requires: xproto damageproto >= 1.0 xfixes -Requires: xorg-x11-proto-devel >= 7.0-1 +Requires: xorg-x11-proto-devel >= 7.2-3 Requires: libXfixes-devel Obsoletes: XFree86-devel, xorg-x11-devel @@ -38,14 +38,8 @@ X.Org X11 libXdamage development package %prep %setup -q -# Disable static library creation by default. -%define with_static 0 - %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --disable-static make %install @@ -62,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README INSTALL ChangeLog %{_libdir}/libXdamage.so.1 @@ -73,13 +67,13 @@ rm -rf $RPM_BUILD_ROOT %dir %{_includedir}/X11 %dir %{_includedir}/X11/extensions %{_includedir}/X11/extensions/Xdamage.h -%if %{with_static} -%{_libdir}/libXdamage.a -%endif %{_libdir}/libXdamage.so %{_libdir}/pkgconfig/xdamage.pc %changelog +* Mon Mar 05 2007 Adam Jackson 1.1-1 +- libXdamage 1.1 + * Mon Nov 20 2006 Adam Jackson 1.0.4-1 - Update to 1.0.4 diff --git a/sources b/sources index c950243..ceebd74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d0eece7a8372a7754db1de08c2be324 libXdamage-1.0.4.tar.bz2 +8aeb25ee35f5538a338462a712e7f9d4 libXdamage-1.1.tar.bz2