rpms/kdeaddons/devel .cvsignore, 1.31, 1.32 kdeaddons.spec, 1.60, 1.61 sources, 1.34, 1.35

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdeaddons.spec sources 
Log Message:
* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-2
- use versioned Obsoletes
- drop Conflicts: akregator

* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-1
- minor cleanups

* Thu Jun 07 2007 Than Ngo <than at redhat.com> - 3.5.7-0.1.fc7
- 3.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	10 Aug 2006 10:04:50 -0000	1.31
+++ .cvsignore	16 Jun 2007 23:57:29 -0000	1.32
@@ -11,3 +11,4 @@
 kdeaddons-3.5.1.tar.bz2
 kdeaddons-3.5.3.tar.bz2
 kdeaddons-3.5.4.tar.bz2
+kdeaddons-3.5.7.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdeaddons.spec	12 Mar 2007 19:21:23 -0000	1.60
+++ kdeaddons.spec	16 Jun 2007 23:57:29 -0000	1.61
@@ -1,9 +1,11 @@
-Version: 3.5.6
-Release: 4%{?dist}
-Name: kdeaddons
+
+Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
-Group: User Interface/Desktops
+Version: 3.5.7
+Release: 2%{?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
@@ -12,7 +14,6 @@
 
 Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
 Patch3: kdeaddons-3.5.3-sdl.patch
-Patch4: kdeaddons-3.5.6-privacy.patch
 
 BuildRequires: kdelibs-devel >= 6:%{version}
 BuildRequires: kdebase-devel >= 6:%{version}
@@ -23,15 +24,13 @@
 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
-
 %description
 Plugins for some KDE applications: %{name} extends the functionality
 of Konqueror (web browser and file manager), noatun (media player)
@@ -42,20 +41,19 @@
 Summary: Extras packages from kdeaddons
 Requires: %{name} = %{version}-%{release}
 Requires: kdegames >= %{version}
-
-Obsoletes: %{name}-atlantikdesigner
-Obsoletes: %{name}-xmms
-
+Obsoletes: %{name}-atlantikdesigner < %{version}-%{release}
+Obsoletes: %{name}-xmms < %{version}-%{release}
 %description extras
 This package includes a game board designer for Atlantik and
 a applet to control mediaplayers.
 
+
 %prep
 %setup -q -a 1
 
 %patch2 -p0 -b .rgb.txt-path
 %patch3 -p1 -b .sdl
-%patch4 -p0 -b .privacy
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -63,13 +61,13 @@
 %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}
 
@@ -100,8 +98,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
@@ -127,9 +126,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
@@ -192,7 +193,18 @@
 %{_datadir}/apps/mediacontrol/
 %{_libdir}/kde3/mediacontrol_panelapplet*
 
+
 %changelog
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-2
+- use versioned Obsoletes
+- drop Conflicts: akregator
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-1
+- minor cleanups
+
+* Thu Jun 07 2007 Than Ngo <than at redhat.com> - 3.5.7-0.1.fc7
+- 3.5.7
+
 * Mon Mar 12 2007 Than Ngo <than at redhat.com> - 3.5.6-4.fc7
 - fix broken dependencies 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	7 Feb 2007 22:28:33 -0000	1.34
+++ sources	16 Jun 2007 23:57:29 -0000	1.35
@@ -1,2 +1,2 @@
-96d6d2a76da2a5232b3b46318456a5bc  kdeaddons-3.5.6.tar.bz2
 0bec436d63d3d04878c1231061326d4a  metabar-fedora.tar.bz2
+7b50fa8e103bd722dfcdfc329126ff28  kdeaddons-3.5.7.tar.bz2