SPECS: kdeadmin.spec - identify PLD Ac in knetworkconf - correct p...

glen glen at pld-linux.org
Fri Aug 4 04:42:07 CEST 2006


Author: glen                         Date: Fri Aug  4 02:42:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- identify PLD Ac in knetworkconf
- correct permissions in knetworkconf

---- Files affected:
SPECS:
   kdeadmin.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: SPECS/kdeadmin.spec
diff -u SPECS/kdeadmin.spec:1.155 SPECS/kdeadmin.spec:1.156
--- SPECS/kdeadmin.spec:1.155	Mon Jul 31 18:04:02 2006
+++ SPECS/kdeadmin.spec	Fri Aug  4 04:42:01 2006
@@ -14,12 +14,13 @@
 Summary(zh_CN):	KDEšÜŔ횤žß
 Name:		kdeadmin
 Version:	3.5.4
-Release:	1
+Release:	1.3
 Epoch:		8
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	579a2e3e8e05cf0851a88def57fcc0a3
+Patch0:		%{name}-knetworkconf-pld.patch
 URL:		http://www.kde.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -195,6 +196,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Archiving;/' \
 	-e 's/Terminal=0/Terminal=false/' \
@@ -207,12 +209,15 @@
 	-e 's/Terminal=0/Terminal=false/' \
 	ksysv/ksysv.desktop \
 	kuser/kuser.desktop
-for f in `find . -name \*.desktop`; do
+for f in `find . -name '*.desktop'`; do
 	if grep -q '\[ven\]' $f; then
 		sed -i -e 's/\[ven\]/[ve]/' $f
 	fi
 done
 
+# kill env, call interpreter directly, so rpm automatics could rule
+%{__sed} -i -e '1s,#!.*bin/env.*perl,#!%{__perl},' knetworkconf/backends/*.pl.in
+
 # Do not check for lilo
 rm lilo-config/configure.in.in
 
@@ -307,7 +312,10 @@
 %defattr(644,root,root,755)
 %{_libdir}/kde3/kcm_knetworkconf*.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_knetworkconf*.so
-%{_datadir}/apps/knetworkconf
+%dir %{_datadir}/apps/knetworkconf
+%dir %{_datadir}/apps/knetworkconf/backends
+%attr(755,root,root) %{_datadir}/apps/knetworkconf/backends/*
+%{_datadir}/apps/knetworkconf/pixmaps
 %{_desktopdir}/kde/kcm_knetworkconfmodule.desktop
 %{_iconsdir}/*/*/*/knetworkconf.png
 %{_iconsdir}/*/*/actions/network_connected_lan_knc.png
@@ -321,6 +329,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2006/08/04 02:42:01  glen
+- identify PLD Ac in knetworkconf
+- correct permissions in knetworkconf
+
 Revision 1.155  2006/07/31 16:04:02  glen
 - use macro in todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdeadmin.spec?r1=1.155&r2=1.156&f=u



More information about the pld-cvs-commit mailing list