rpms/kdelibs/devel .cvsignore, 1.40.2.3, 1.40.2.4 kde4.csh, 1.1.2.4, 1.1.2.5 kde4.sh, 1.1.2.4, 1.1.2.5 kdelibs.spec, 1.223.2.22, 1.223.2.23 sources, 1.51.2.2, 1.51.2.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603

Modified Files:
      Tag: kdelibs-kde4-branch
	.cvsignore kde4.csh kde4.sh kdelibs.spec sources 
Log Message:
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
diff -u -r1.40.2.3 -r1.40.2.4
--- .cvsignore	29 Jul 2007 00:44:09 -0000	1.40.2.3
+++ .cvsignore	20 Sep 2007 14:24:32 -0000	1.40.2.4
@@ -1,3 +1,3 @@
 clog
-kdelibs-3.91.0.tar.bz2
 kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2


Index: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.csh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- kde4.csh	13 Sep 2007 08:04:47 -0000	1.1.2.4
+++ kde4.csh	20 Sep 2007 14:24:32 -0000	1.1.2.5
@@ -5,12 +5,12 @@
 if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
 
 ## When/if using prelinking, avoids use of kdeinit
-if ( -f /etc/sysconfig/prelink ) then
-   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
-   if ( "$PRELINKING" == "yes" )  then
+#if ( -f /etc/sysconfig/prelink ) then
+#   set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
+#   if ( "$PRELINKING" == "yes" )  then
       if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
-   endif
-endif
+#   endif
+#endif
 
 ## if not using IP6, speeds DNS operations
 # # if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/Attic/kde4.sh,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- kde4.sh	13 Sep 2007 08:04:47 -0000	1.1.2.4
+++ kde4.sh	20 Sep 2007 14:24:32 -0000	1.1.2.5
@@ -5,11 +5,11 @@
 [ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
 
 ## When/if using prelinking, avoids (some) use of kdeinit
-if [ -f /etc/sysconfig/prelink ]; then
-  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
+#if [ -f /etc/sysconfig/prelink ]; then
+#  if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
     [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-  fi
-fi
+#  fi
+#fi
 
 ## if not using IP6, speeds DNS operations
 # [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.22
retrieving revision 1.223.2.23
diff -u -r1.223.2.22 -r1.223.2.23
--- kdelibs.spec	13 Sep 2007 22:11:52 -0000	1.223.2.22
+++ kdelibs.spec	20 Sep 2007 14:24:32 -0000	1.223.2.23
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -95,11 +95,12 @@
 %endif
 Requires: qt4-devel
 Requires: openssl-devel
+Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
 ## FIXME/TODO: trim these down  -- Rex
 #Requires: libxslt-devel aspell-devel giflib-devel
-#Requires: libpng-devel bzip2-devel libacl-devel gettext-devel
+#Requires: libpng-devel gettext-devel
 #Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
-#Requires: zlib-devel krb5-devel libattr-devel gamin-devel strigi-devel
+#Requires: krb5-devel
 #Requires: alsa-lib-devel avahi-devel
 %description devel
 This package includes the header files you will need to compile
@@ -123,7 +124,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%cmake_kde4 ..
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
@@ -229,6 +230,11 @@
 
 
 %changelog
+* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
+- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
+- update sources
+- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch
+
 * Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
 - rename js to kjs because of file conflict (kde#149840)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -r1.51.2.2 -r1.51.2.3
--- sources	29 Jul 2007 00:44:09 -0000	1.51.2.2
+++ sources	20 Sep 2007 14:24:32 -0000	1.51.2.3
@@ -1 +1 @@
-1a32d2892c9a7ac4a7fd4d77a86f720b  kdelibs-3.92.0.tar.bz2
+dac92cdd69bd08d5877e288e7371499d  kdelibs-3.93.0.tar.bz2