diff --git a/utempter.changes b/utempter.changes index 97625be..3294d0c 100644 --- a/utempter.changes +++ b/utempter.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Nov 13 16:13:17 UTC 2014 - tchvatal@suse.com + +- remove /sbin/ldconfig -n $DESTDIR%{_libdir} as it should be not + needed in install phase +- Remove Requires: %name as there is no name and adjust obsolete + as there exist version 0.5.5.6 which is larger than the provides +- Remove sle10 obsolete for ppc64 utempter-64bit +- Clean-up with spec-cleaner + ------------------------------------------------------------------- Thu Aug 14 15:59:02 UTC 2014 - fcrozat@suse.com diff --git a/utempter.spec b/utempter.spec index ed2b997..26cdda1 100644 --- a/utempter.spec +++ b/utempter.spec @@ -17,28 +17,20 @@ %define lname libutempter0 -Name: utempter %define utmpGroup utmp +Name: utempter Version: 1.1.6 Release: 0 Summary: A privileged helper for utmp and wtmp updates License: MIT Group: Productivity/Security -# bug437293 -%ifarch ppc64 -Obsoletes: utempter-64bit -%endif Url: ftp://ftp.altlinux.org/pub/people/ldv/utempter/ -Source: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%name-%version.tar.bz2 -Source1: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%name-%version.tar.bz2.asc +Source: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.altlinux.org/pub/people/ldv/utempter/lib%{name}-%{version}.tar.bz2.asc Source2: baselibs.conf -Source3: %name.keyring +Source3: %{name}.keyring Patch0: utempter.eal3.diff Patch1: utempter-no-staticlib.patch -# will be checked by source service -#BuildRequires: gpg-offline - -# BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,26 +41,25 @@ setuid root. %package devel Summary: Development files for utempter Group: Development/Libraries/C and C++ -Requires: %lname = %{version} +Requires: %{lname} = %{version} %description devel Utempter is a privileged helper for utmp and wtmp updates. This package contains the development files needed. -%package -n %lname +%package -n %{lname} Summary: Shared library of utempter Group: Development/Libraries/C and C++ -PreReq: permissions -Provides: utempter = %version -Obsoletes: utempter <= 0.5.5 -Requires: %{name} +Requires(post): permissions +Provides: %{name} = %{version} +Obsoletes: %{name} < 0.5.6 -%description -n %lname +%description -n %{lname} Utempter is a privileged helper for utmp and wtmp updates. This package contains the library used by applications. %prep -%setup -q -n lib%name-%version +%setup -q -n lib%{name}-%{version} %patch0 -p1 %patch1 -p1 @@ -79,26 +70,26 @@ make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags} -fPIC" CC="gcc" export DESTDIR=%{buildroot} make PREFIX=$DESTDIR libdir=%{_libdir} DESTDIR=%{buildroot} install chmod 755 $DESTDIR%{_libdir}/libutempter.so* -/sbin/ldconfig -n $DESTDIR%{_libdir} -%verifyscript -n %lname -%verify_permissions -e /usr/lib/utempter/utempter +%verifyscript -n %{lname} +%verify_permissions -e %{_libexecdir}/utempter/utempter -%post -n %lname -%set_permissions /usr/lib/utempter/utempter +%post -n %{lname} +%set_permissions %{_libexecdir}/utempter/utempter /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%files -n %lname +%files -n %{lname} %defattr(644,root,root,755) %doc COPYING -%dir /usr/lib/utempter -%attr(02755, root, %{utmpGroup}) /usr/lib/utempter/utempter +%dir %{_libexecdir}/utempter +%attr(02755, root, %{utmpGroup}) %{_libexecdir}/utempter/utempter %attr(755,root,root) %{_libdir}/libutempter.so.* %attr(644,root,root) %doc %{_mandir}/man8/* %files devel +%defattr(-,root,root) %doc COPYING %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libutempter.so