rpms/kdeaddons/F-7 .cvsignore,1.32,1.33 kdeaddons.spec,1.63,1.64

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdeaddons.spec 
Log Message:
* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-3
- move noatun-plugins to -extras
- move mediacontrol to main
- improve %description



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-7/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	6 Jun 2007 22:48:21 -0000	1.32
+++ .cvsignore	14 Aug 2007 17:28:43 -0000	1.33
@@ -1,14 +1,2 @@
-kdeaddons-3.3.0.tar.bz2
-kdeaddons-3.3.1.tar.bz2
-kdeaddons-3.3.2.tar.bz2
-kdeaddons-3.4.0-rc1.tar.bz2
-kdeaddons-3.4.0.tar.bz2
-kdeaddons-3.4.1.tar.bz2
-kdeaddons-3.4.2.tar.bz2
-kdeaddons-3.4.91.tar.bz2
-kdeaddons-3.4.92.tar.bz2
-kdeaddons-3.5.0.tar.bz2
-kdeaddons-3.5.1.tar.bz2
-kdeaddons-3.5.3.tar.bz2
-kdeaddons-3.5.4.tar.bz2
+metabar-fedora.tar.bz2
 kdeaddons-3.5.7.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/F-7/kdeaddons.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdeaddons.spec	14 Jun 2007 19:03:21 -0000	1.63
+++ kdeaddons.spec	14 Aug 2007 17:28:43 -0000	1.64
@@ -1,9 +1,11 @@
-Version: 3.5.7
-Release: 1%{?dist}
-Name: kdeaddons
+
+Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
-Group: User Interface/Desktops
+Version: 3.5.7
+Release: 3%{?dist}
+
 License: GPL
+Group: User Interface/Desktops
 Url: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: metabar-fedora.tar.bz2
@@ -13,7 +15,6 @@
 Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
 Patch3: kdeaddons-3.5.3-sdl.patch
 
-BuildRequires: kdelibs-devel >= 6:%{version}
 BuildRequires: kdebase-devel >= 6:%{version}
 BuildRequires: kdegames-devel >= 6:%{version}
 BuildRequires: kdemultimedia-devel >= 6:%{version}
@@ -22,52 +23,56 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: openssl-devel
 BuildRequires: db4-devel
+BuildRequires: xmms-devel
 
-Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-# Contains akregator konq-plugin
-Conflicts: akregator < 0:1.0
+Obsoletes: %{name}-xmms < %{version}-%{release}
 
 %description
-Plugins for some KDE applications: %{name} extends the functionality
-of Konqueror (web browser and file manager), noatun (media player)
-and Kate (text editor), Kicker, knewsticker.
+A collection of KDE Addons/Plugins, including: 
+* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver
+* kate (plugins) 
+* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol
+* knewsticker-scripts
 
 %package extras
 Group: User Interface/Desktops
 Summary: Extras packages from kdeaddons
 Requires: %{name} = %{version}-%{release}
 Requires: kdegames >= %{version}
-
-Obsoletes: %{name}-atlantikdesigner
-Obsoletes: %{name}-xmms
-
+Obsoletes: %{name}-atlantikdesigner < %{version}-%{release}
 %description extras
-This package includes a game board designer for Atlantik and
-a applet to control mediaplayers.
+This package includes:
+* atlantikdesigner: game board designer
+* noatun-plugins
+
 
 %prep
 %setup -q -a 1
 
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %patch2 -p0 -b .rgb.txt-path
+%endif
 %patch3 -p1 -b .sdl
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
   --includedir=%{_includedir}/kde \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -98,8 +103,9 @@
 done
 
 # install fedora metabar theme
-cp -rf fedora %{buildroot}/%{_datadir}/apps/metabar/themes
-install -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/config/
+cp -prf fedora %{buildroot}%{_datadir}/apps/metabar/themes
+install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/
+
 
 %post
 /sbin/ldconfig
@@ -125,9 +131,11 @@
 touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING-DOCS
@@ -144,7 +152,9 @@
 %{_datadir}/apps/kate/*
 %{_datadir}/apps/katepart/syntax/*
 %{_datadir}/apps/katexmltools
-%{_datadir}/apps/knewsticker/scripts/
+# own dir so we don't need to Requires: kdenetwork too
+%dir %{_datadir}/apps/knewsticker
+%{_datadir}/apps/knewsticker/*
 %{_datadir}/apps/khtml/kpartplugins/*
 %{_datadir}/apps/konq*view/kpartplugins/*
 %{_datadir}/apps/konqueror/icons/*/*/*/*
@@ -170,10 +180,11 @@
 %exclude %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
 %exclude %{_datadir}/applications/kde/atlantikdesigner.desktop
 
-# xmms
-%exclude %{_datadir}/apps/kicker/applets/mediacontrol.desktop
-%exclude %{_datadir}/apps/mediacontrol
-%exclude %{_libdir}/kde3/mediacontrol_panelapplet*
+# noatun-plugins
+%exclude %{_bindir}/noatun*
+%exclude %{_libdir}/kde3/noatun*
+%exclude %{_datadir}/apps/noatun/*
+
 
 %files extras
 %defattr(-,root,root,-)
@@ -185,12 +196,22 @@
 %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
 %{_datadir}/applications/kde/atlantikdesigner.desktop
 
-# xmms
-%{_datadir}/apps/kicker/applets/mediacontrol.desktop
-%{_datadir}/apps/mediacontrol/
-%{_libdir}/kde3/mediacontrol_panelapplet*
+# noatun-plugins
+%{_bindir}/noatun*
+%{_libdir}/kde3/noatun*
+%{_datadir}/apps/noatun/*
+
 
 %changelog
+* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-3
+- move noatun-plugins to -extras
+- move mediacontrol to main
+- improve %%description
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-2
+- use versioned Obsoletes
+- drop Conflicts: akregator
+
 * Thu Jun 07 2007 Than Ngo <than at redhat.com> - 3.5.7-1.fc7
 - 3.5.7