SPECS: setup.spec - kill trailing spaces from services file, rel 1

glen glen at pld-linux.org
Tue May 27 13:42:51 CEST 2008


Author: glen                         Date: Tue May 27 11:42:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill trailing spaces from services file, rel 1

---- Files affected:
SPECS:
   setup.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: SPECS/setup.spec
diff -u SPECS/setup.spec:1.139 SPECS/setup.spec:1.140
--- SPECS/setup.spec:1.139	Tue May 27 13:20:04 2008
+++ SPECS/setup.spec	Tue May 27 13:42:45 2008
@@ -16,7 +16,7 @@
 Summary(tr.UTF-8):	Basit kurulum dosyaları
 Name:		setup
 Version:	2.5.7
-Release:	0.1
+Release:	1
 License:	Public Domain, partially BSD-like
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.bz2
@@ -73,10 +73,14 @@
 %prep
 %setup -q -a1
 %patch0 -p1
+mv iana-etc{-%{iana_etc_ver},}
 
 %build
-%{__make} -C iana-etc-%{iana_etc_ver}
-%{__patch} iana-etc-%{iana_etc_ver}/services %{PATCH1}
+%{__make} -C iana-etc
+%{__patch} iana-etc/services %{PATCH1}
+
+# kill trailing spaces/tabs
+%{__sed} -i -e 's,[ \t]\+$,,' iana-etc/services
 
 %{__make} \
 	OPT_FLAGS="%{rpmcflags}" \
@@ -90,7 +94,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT%{_sysconfdir}/protocols
+cp -a iana-etc/protocols $RPM_BUILD_ROOT%{_sysconfdir}/protocols
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -137,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2008-05-27 11:42:45  glen
+- kill trailing spaces from services file, rel 1
+
 Revision 1.139  2008-05-27 11:20:04  glen
 - update to 2.5.7 (damn cvs locks!)
 
@@ -504,7 +511,7 @@
 - removed /etc/printcap.
 
 Revision 1.29  2000/07/22 07:32:52  kloczek
-new version 2.3.0:
+- new version 2.3.0:
 - /etc/services: - added 464/udp for kpasswdd (waszi),
 - /etc/services: - added 224/{tcp,udp} for masqdialer (zagrodzki),
 - /etc/hosts: - added 127.0.0.1 (baggins),
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/setup.spec?r1=1.139&r2=1.140&f=u



More information about the pld-cvs-commit mailing list