SPECS: shadow.spec - added -removed-programs.patch

glen glen at pld-linux.org
Sat Jun 10 22:03:00 CEST 2006


Author: glen                         Date: Sat Jun 10 20:03:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added -removed-programs.patch

---- Files affected:
SPECS:
   shadow.spec (1.117 -> 1.118) 

---- Diffs:

================================================================
Index: SPECS/shadow.spec
diff -u SPECS/shadow.spec:1.117 SPECS/shadow.spec:1.118
--- SPECS/shadow.spec:1.117	Fri Jun  9 23:41:09 2006
+++ SPECS/shadow.spec	Sat Jun 10 22:02:55 2006
@@ -14,7 +14,7 @@
 #
 # Conditional build:
 %bcond_without	selinux		# build without SE-Linux support
-%bcond_with	shared		# build with shared libshadow
+%bcond_with	shared		# build with shared libshadow (linking with selinux is broken)
 #
 Summary:	Shadow password file utilities for Linux
 Summary(de):	Shadow-Paßwortdatei-Dienstprogramme für Linux
@@ -25,7 +25,7 @@
 Summary(tr):	Gölge parola dosyasý araçlarý
 Name:		shadow
 Version:	4.0.16
-Release:	0.8
+Release:	0.10
 Epoch:		1
 License:	BSD
 Group:		Applications/System
@@ -42,7 +42,8 @@
 Patch0:		%{name}-pld.patch
 Patch1:		%{name}-chage_expdays.patch
 Patch2:		%{name}-po-update.patch
-Patch3:		%{name}-typo.patch
+Patch3:		%{name}-removed-programs.patch
+Patch4:		%{name}-typo.patch
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.0
 BuildRequires:	gettext-devel >= 0.12.1
@@ -140,7 +141,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
+#%patch4 -p1
 
 # ugh, too populated to patch
 %{__sed} -i -e 's/instead DES/instead of DES/' src/chpasswd.c po/*.po
@@ -204,19 +206,6 @@
 # no -devel, be gone
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# included in glibc-devel
-rm -f $RPM_BUILD_ROOT%{_mandir}{,*/}/man3/{getspnam,shadow}.3
-# /bin/login already in login (from util-linux.spec)
-rm -f $RPM_BUILD_ROOT{%{_bindir}/login,/etc/pam.d/login,%{_sbindir}/logoutd,%{_mandir}/{,*/}man1/login.1,%{_mandir}/{,*/}man5/porttime.5,%{_mandir}/{,*/}man8/logoutd.8}
-# /bin/id already in coreutils
-rm -f $RPM_BUILD_ROOT%{_mandir}{,*/}/man1/id.1
-# /bin/su already in coreutils
-rm -f $RPM_BUILD_ROOT{%{_bindir}/su,/etc/pam.d/su,%{_mandir}/{,*/}man1/su.1}
-# /usr/bin/groups already in coreutils
-rm -f $RPM_BUILD_ROOT{%{_bindir}/groups,%{_mandir}/{,*/}man1/groups.1}
-# /etc/limits not used with pam
-rm -f $RPM_BUILD_ROOT%{_mandir}/{,*/}man5/limits.5
-
 %find_lang %{name}
 
 %clean
@@ -590,6 +579,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2006/06/10 20:02:55  glen
+- added -removed-programs.patch
+
 Revision 1.117  2006/06/09 21:41:09  glen
 - added po-update.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/shadow.spec?r1=1.117&r2=1.118&f=u



More information about the pld-cvs-commit mailing list