rpms/kdelibs4/F-8 .cvsignore, 1.4, 1.5 kdelibs4.spec, 1.7, 1.8 sources, 1.4, 1.5

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27982

Modified Files:
	.cvsignore kdelibs4.spec sources 
Log Message:
kde-3.96.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Nov 2007 02:53:41 -0000	1.4
+++ .cvsignore	3 Dec 2007 02:26:50 -0000	1.5
@@ -1,2 +1 @@
-kdelibs-3.95.2.tar.bz2
-kdelibs-3.96.0.tar.bz2
+kdelibs-3.96.2.tar.bz2


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdelibs4.spec	20 Nov 2007 18:49:08 -0000	1.7
+++ kdelibs4.spec	3 Dec 2007 02:26:50 -0000	1.8
@@ -3,10 +3,10 @@
 # 1. package some noarch bits separately: apidocs.
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 3.96.0
-Release: 4%{?dist}
+Version: 3.96.2
+Release: 3%{?dist}
 
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 8
 Name: kdelibs
 Epoch: 6
 Obsoletes: kdelibs4 < %{version}-%{release}
@@ -28,14 +28,13 @@
 BuildRequires: kde-filesystem >= 4
 Requires: dbus-x11
 Requires: hicolor-icon-theme
-## FIXME/TODO: When kdebase-runtime is available -- Rex
-%if 0%{?fedora} > 7 
-Requires: kdebase-runtime oxygen-icon-theme
-%endif
+# not *strictly* required here, but how better to pull kdebase-runtime in?  -- Rex
+Requires: kdebase-runtime
+Requires: oxygen-icon-theme
 Requires: kde-filesystem >= 4
+Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
-#Requires: kde4-settings
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -82,6 +81,8 @@
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) 
 %define x_deps libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
 %{?x_deps:BuildRequires: %{x_deps}}
+BuildRequires: openssh-clients
+BuildRequires: subversion
 
 %description
 Libraries for the K Desktop Environment 4.
@@ -90,8 +91,7 @@
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if "%{name}" == "kdelibs4"
-%else
+%if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
@@ -135,6 +135,7 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
+%if "%{name}" != "kdelibs"
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
       %{buildroot}%{_kde4_bindir}/kunittestmodrunner
@@ -142,6 +143,7 @@
       %{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
 rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
 rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
+%endif
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -160,8 +162,8 @@
 done
 popd
 
-install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
-install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
+install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
+install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
 
 
 %post
@@ -182,7 +184,7 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO
-%doc COPYING COPYING-DOCS COPYING.LIB
+%doc COPYING.LIB
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/kconfig_compiler4
@@ -199,6 +201,9 @@
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
 %{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
+%if "%{name}" == "kdelibs"
+%{_kde4_datadir}/locale/all_languages/
+%endif
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
@@ -221,6 +226,19 @@
 
 
 %changelog
+* Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3
+- install profile scripts as 644 instead of 755 (Ville Skyttä, #407521)
+
+* Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-2
+- BR openssh-clients and subversion (Sebastian Vahl)
+- make this the default kdelibs for F9 again
+
+* Tue Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-1
+- kde-3.96.2
+
+* Tue Nov 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.1-1
+- kde-3.96.1
+
 * Tue Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-4
 - Requires: kdebase-runtime oxygen-icon-theme (where available)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2007 02:53:41 -0000	1.4
+++ sources	3 Dec 2007 02:26:50 -0000	1.5
@@ -1 +1 @@
-d73ec2c5473c99a2a0e2c685335e0180  kdelibs-3.96.0.tar.bz2
+f8dc1a0a7ae5b580b6d85938995789cc  kdelibs-3.96.2.tar.bz2