rpms/kdesdk/F-7 kdesdk.spec,1.70,1.71

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Jul 24 22:15:45 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24124

Modified Files:
	kdesdk.spec 
Log Message:
* Fri Jul 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-7
- don't use %pretrans (#249374)



Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-7/kdesdk.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdesdk.spec	13 Jul 2007 12:50:18 -0000	1.70
+++ kdesdk.spec	24 Jul 2007 22:15:13 -0000	1.71
@@ -15,7 +15,7 @@
 Name:    kdesdk
 Summary: The KDE Software Development Kit (SDK)
 Version: 3.5.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group: User Interface/Desktops
@@ -126,11 +126,10 @@
 
 
 # trick to replace a dir by a symlink -- Rex
-%pretrans
-if [ ! -L  %{_docdir}/HTML/en/cervisia/common ]; then 
-  rm -rf   %{_docdir}/HTML/en/cervisia/common
+%pre
+if [ $1 -gt 0 -a ! -L  %{_docdir}/HTML/en/cervisia/common ]; then 
+  rm -rf %{_docdir}/HTML/en/cervisia/common ||:
 fi
-exit 0
 
 %post
 /sbin/ldconfig
@@ -150,7 +149,7 @@
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_docdir}/HTML/en/*
 %{_bindir}/*
 %{_libdir}/kde3/*
@@ -168,7 +167,7 @@
 %{_datadir}/config.kcfg/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kde/*
 %{_libdir}/*.so
 %exclude %{_libdir}/libkdeinit_*.so
@@ -177,6 +176,9 @@
 
 
 %changelog
+* Fri Jul 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-7
+- don't use %%pretrans (#249374)
+
 * Thu Jun 28 2007 Than Ngo <than at redhat.com> - 3.5.7-6
 - get rid of flex workaround, it's now fixed in new flex
 




More information about the scm-commits mailing list