rpms/kdenetwork/devel .cvsignore, 1.42, 1.43 kdenetwork.spec, 1.115, 1.116 sources, 1.48, 1.49

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Log Message:
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
- kde-3.97.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	5 Dec 2007 16:00:09 -0000	1.42
+++ .cvsignore	6 Dec 2007 04:05:23 -0000	1.43
@@ -1,3 +1,4 @@
 kdenetwork-3.5.7.tar.bz2
 kdenetwork-3.5.8.tar.bz2
 kdenetwork-3.96.2.tar.bz2
+kdenetwork-3.97.0.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdenetwork.spec	5 Dec 2007 16:00:09 -0000	1.115
+++ kdenetwork.spec	6 Dec 2007 04:05:23 -0000	1.116
@@ -1,15 +1,15 @@
+
 # FIXME/TODO: needed BuildRequires 
 # libvncserver, mDNS, Decibel
 
+Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 3.96.2
-Release: 2%{?dist}
-Summary: K Desktop Environment - Network Applications
+Version: 3.97.0
+Release: 1%{?dist}
 
-Group: Applications/Internet
-# FIXME/TODO: Check license
 License: GPLv2
+Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,36 +27,25 @@
 # Is this one already used?
 # QT_TAPIOCA_LIBRARY:FILEPATH=QT_TAPIOCA_LIBRARY-NOTFOUND
 
+BuildRequires:  boost-devel
+BuildRequires:  cmake
+BuildRequires:  giflib-devel
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
-BuildRequires:  cmake
-BuildRequires:  giflib-devel
-BuildRequires:  pcre-devel
-BuildRequires:  boost-devel
 BuildRequires:  libidn-devel
+#BuildRequires: openslp-devel
+BuildRequires:  pcre-devel
 BuildRequires:  qca2-devel
-#BuildRequires:  openslp-devel
 BuildRequires:  sqlite-devel
-# FIMXE/TODO: This ones will be in kdelibs4-devel soon; could be removed then
-BuildRequires:  libxkbfile-devel
-BuildRequires:  libXdamage-devel
-BuildRequires:  libXv-devel
-BuildRequires:  libXpm-devel
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  libXtst-devel
-BuildRequires:  libXxf86misc-devel
-BuildRequires:  libXcomposite-devel
-
 
 # FIXME/TODO: are there other explicit Requires?
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-BuildRequires:  kdebase-workspace >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # FIXME/TODO: Taken from 3.5.8. review needed
@@ -79,12 +68,13 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Header files for kdebase-workspace
+Summary:  Header files for %{name} 
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 Header files for developing applications using %{name}.
 
+
 %prep
 %setup -q
 
@@ -92,31 +82,19 @@
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} -DQT_MKSPECS_DIR="`qmake-qt4 -query QT_INSTALL_PREFIX`/mkspecs" ../
+# why is QT_MKSPECS_DIR required? -- Rex
+%{cmake_kde4} -DQT_MKSPECS_DIR="%{_qt4_prefix}/mkspecs" ../
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 rm -rf %{buildroot}
-mkdir %{buildroot}
+
+mkdir -p %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
-pushd %{buildroot}%{_kde4_libdir}
-for i in lib*.so
-do
-  case "$i" in
-    libkdeinit4_*.so|libqgroupwise.so)
-      ;;
-    *)
-      linktarget=`readlink "$i"`
-        rm -f "$i"
-        ln -sf "../../$linktarget" "kde4/devel/$i"
-      ;;
-  esac
-done
-popd
 
 %clean
 rm -rf %{buildroot}
@@ -135,7 +113,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING-DOCS COPYING.LIB README
+%doc COPYING README
 %{_kde4_bindir}/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
@@ -149,14 +127,14 @@
 %{_kde4_appsdir}/zeroconf/
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
-%{_kde4_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/kcontrol/lanbrowser/
 %{_kde4_docdir}/HTML/en/kget/
 %{_kde4_docdir}/HTML/en/knewsticker/
-%{_kde4_docdir}/HTML/en/kopete
+%{_kde4_docdir}/HTML/en/kopete/
 %{_kde4_docdir}/HTML/en/kppp/
 %{_kde4_docdir}/HTML/en/krdc/
 %{_kde4_docdir}/HTML/en/lisa/
@@ -165,21 +143,24 @@
 %{_kde4_configdir}/kopeterc
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_appsdir}/kconf_update/*
+%{_kde4_libdir}/kde4/*
 
 %files libs
 %defattr(-,root,root,-)
-%doc COPYING
-%{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/libqgroupwise.so
-%exclude %{_kde4_libdir}/kde4/devel/
+%{_kde4_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/devel/*
+%exclude %{_kde4_libdir}/libqgroupwise.so
+%{_kde4_libdir}/lib*.so
 %{_kde4_includedir}/*
 
+
 %changelog
+* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
+- kde-3.97.0
+
 * Wed Dec 05 2007 Than Ngo <than at redhat.com> 3.96.2-2
 - fix building kopete
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	5 Dec 2007 16:00:09 -0000	1.48
+++ sources	6 Dec 2007 04:05:23 -0000	1.49
@@ -1 +1 @@
-4b19f88833e39c9348a195bd100df4f8  kdenetwork-3.96.2.tar.bz2
+efffb1c28457c3485632b40c8c995762  kdenetwork-3.97.0.tar.bz2