From e25062872b2ebc908cd864cb27665e466a0187b0 Mon Sep 17 00:00:00 2001 From: mharris Date: Mon, 3 Oct 2005 16:55:47 +0000 Subject: [PATCH] - Updated to new upstream libXScrnSaver-0.99.1 which changes the .so name back to libXss, but keeps the inconsistent package name. This may change again in the future. --- .cvsignore | 1 + libXScrnSaver.spec | 29 +++++++++++++++-------------- sources | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2976621..f485c80 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libXScrnSaver-0.99.0.tar.bz2 +libXScrnSaver-0.99.1.tar.bz2 diff --git a/libXScrnSaver.spec b/libXScrnSaver.spec index 1d81b2f..93094e9 100644 --- a/libXScrnSaver.spec +++ b/libXScrnSaver.spec @@ -1,34 +1,32 @@ - -Summary: X.Org X11 libXScrnSaver runtime library +Summary: X.Org X11 libXss runtime library Name: libXScrnSaver -Version: 0.99.0 -Release: 3 +Version: 0.99.1 +Release: 1 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXext-devel - Conflicts: XFree86-libs, xorg-x11-libs %description -X.Org X11 libXScrnSaver runtime library +X.Org X11 libXss runtime library %package devel Summary: X.Org X11 libXScrnSaver development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} - Conflicts: XFree86-devel, xorg-x11-devel %description devel -X.Org X11 libXScrnSaver development package +X.Org X11 libXss development package %prep %setup -q @@ -37,7 +35,6 @@ X.Org X11 libXScrnSaver development package %define with_static 0 %build - %configure \ %if ! %{with_static} --disable-static @@ -45,7 +42,6 @@ X.Org X11 libXScrnSaver development package make %install - rm -rf $RPM_BUILD_ROOT %makeinstall @@ -62,15 +58,15 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING README INSTALL ChangeLog %dir %{_libdir} -%{_libdir}/libXScrnSaver.so.7 -%{_libdir}/libXScrnSaver.so.7.0.0 +%{_libdir}/libXss.so.7 +%{_libdir}/libXss.so.7.0.0 %files devel %defattr(-,root,root,-) %if %{with_static} -%{_libdir}/libXScrnSaver.a +%{_libdir}/libXss.a %endif -%{_libdir}/libXScrnSaver.so +%{_libdir}/libXss.so %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xscrnsaver.pc %dir %{_mandir} @@ -78,6 +74,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Xss.3.gz %changelog +* Mon Oct 3 2005 Mike A. Harris 0.99.1-1 +- Updated to new upstream libXScrnSaver-0.99.1 which changes the .so name back + to libXss, but keeps the inconsistent package name. This may change again + in the future. + * Thu Sep 29 2005 Mike A. Harris 0.99.0-3 - Renamed package to remove xorg-x11 from the name due to unanimous decision between developers. diff --git a/sources b/sources index c3dfcbd..13eb641 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fee23bc4e3fc7617bdaf8ca89052ab6a libXScrnSaver-0.99.0.tar.bz2 +706379f7c1105a2edd0a092c3ef40fa8 libXScrnSaver-0.99.1.tar.bz2