SPECS: webmin.spec - avoid installing unneeded find-lang and calde...

[glen]

Author: glen                         Date: Sat Mar 25 14:07:58 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid installing unneeded find-lang and caldera-init files
- cleanup patches

---- Files affected:
SPECS:
   webmin.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/webmin.spec
diff -u SPECS/webmin.spec:1.77 SPECS/webmin.spec:1.78
--- SPECS/webmin.spec:1.77	Sat Mar 25 14:25:47 2006
+++ SPECS/webmin.spec	Sat Mar 25 15:07:53 2006
@@ -6,7 +6,7 @@
 Summary(pl):	Webmin - administracja przez WWW
 Name:		webmin
 Version:	1.260
-Release:	1.6
+Release:	1.7
 License:	BSD-like
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/webadmin/%{name}-%{version}.tar.gz
@@ -16,11 +16,10 @@
 Source1:	%{name}.init
 Source2:	%{name}-miniserv.conf
 Source3:	%{name}-find-lang.sh
-Patch0:		%{name}-PLD.patch
-Patch1:		%{name}-PLD-module.info.patch
-Patch2:		%{name}-ad-pld-config.patch
-Patch3:		%{name}-software-poldek.patch
-Patch4:		%{name}-quote.patch
+Patch0:		%{name}-PLD-module.info.patch
+Patch1:		%{name}-ad-pld-config.patch
+Patch2:		%{name}-software-poldek.patch
+Patch3:		%{name}-quote.patch
 URL:		http://www.webmin.com/
 BuildRequires:	perl-CGI
 BuildRequires:	perl-Compress-Zlib
@@ -1405,12 +1404,10 @@
 
 %prep
 %setup -q -n %{name}-%{source_version}
-#%patch0 -p1 XXX?!
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-install %{SOURCE3} .
 
 # only for solaris, so rm
 rm -rf zones	# Create and manage Solaris 10 zones.
@@ -1432,7 +1429,7 @@
     */*msc* */*netbsd */*osf1 */*redhat* */*slackware* */*sol* */*suse* */*trustix* */*turbo* */*united* \
     */*unixware */*windows */*maco* */*mandrake* */*openbs* */*openserv* */*open-lin* */config-\*-linux
 
-rm -f *aix *cobalt* *coherent* *corel* *debian* *freebsd *generic* *gentoo* *hpux *iri* *lfs*  \
+rm -f *caldera-init *aix *cobalt* *coherent* *corel* *debian* *freebsd *generic* *gentoo* *hpux *iri* *lfs*  \
     *-msc-* *netbsd  *osf1 *redhat* *slackware* *solari* *sol* *suse* *trustix* *turbo* *united* \
     *unixware *windows *maco* *mandrake* *openbs* *openserv* *open-lin*
 
@@ -1482,13 +1479,13 @@
 	cluster-copy cluster-cron cluster-usermin cluster-passwd cluster-shell \
 	squid sshd status syslog telnet time useradmin usermin webmin dnsadmin \
 	webminlog wuftpd xinetd inetd idmapd frox bandwidth firewall ; do
-	./webmin-find-lang.sh $RPM_BUILD_ROOT %{_datadir}/webmin/$a $a
+	sh %{SOURCE3} $RPM_BUILD_ROOT %{_datadir}/webmin/$a $a
 done
 for a in vgetty sarg updown htaccess-htpasswd spam smart-status ppp-client \
 	backup-config change-user dovecot cpan; do
-	./webmin-find-lang.sh $RPM_BUILD_ROOT %{_datadir}/webmin/$a $a --no-help
+	sh %{SOURCE3} $RPM_BUILD_ROOT %{_datadir}/webmin/$a $a --no-help
 done
-./webmin-find-lang.sh $RPM_BUILD_ROOT %{_datadir}/webmin MAIN
+sh %{SOURCE3} $RPM_BUILD_ROOT %{_datadir}/webmin MAIN
 
 cat custom.lang file.lang telnet.lang webminlog.lang > admin-tools.lang
 cat fdisk.lang raid.lang > disk-tools.lang
@@ -3387,6 +3384,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2006/03/25 14:07:53  glen
+- avoid installing unneeded find-lang and caldera-init files
+- cleanup patches
+
 Revision 1.77  2006/03/25 13:25:47  glen
 - os, not webmin version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/webmin.spec?r1=1.77&r2=1.78&f=u