Author: glen Date: Sat Apr 1 17:05:50 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged 3.5.2 from AC-branch
---- Files affected:
SPECS:
kdeaddons.spec (1.119 -> 1.120)
---- Diffs:
================================================================
Index: SPECS/kdeaddons.spec
diff -u SPECS/kdeaddons.spec:1.119 SPECS/kdeaddons.spec:1.120
--- SPECS/kdeaddons.spec:1.119 Sun Mar 19 21:11:03 2006
+++ SPECS/kdeaddons.spec Sat Apr 1 19:05:45 2006
@@ -1,39 +1,42 @@
# $Revision$, $Date$
+# TODO
+# - locolor icons
#
# Conditional build:
%bcond_without kdegames # no kdegames dep
%bcond_without xmms # no xmms dep
#
%define _state stable
-%define _kdever 3.5.1
-%define _ver 3.5.1
-
-%define _minlibsevr 9:3.5.1
-%define _minbaseevr 9:3.5.1
+%define _minlibsevr 9:%{version}
+%define _minbaseevr 9:%{version}
+%define _minmultimediaevr 9:%{version}
+%define _minkdepimevr 9:%{version}
+%define _minnetworkevr 10:%{version}
+%define _mingamesevr 8:%{version}
Summary: K Desktop Environment - Plugins
Summary(es): K Desktop Environment - Plugins e Scripts para aplicativos KDE
Summary(pl): Wtyczki do aplikacji KDE
Summary(pt_BR): K Desktop Environment - Plugins e Scripts para
aplicaçőes KDE
Name: kdeaddons
-Version: %{_ver}
-Release: 2
+Version: 3.5.2
+Release: 1
Epoch: 1
License: GPL
Group: X11/Applications
-Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{_kdever}/src/%{name}-%{_ver}.tar.bz2
-# Source0-md5: cbd2a6f65ae7338736d93b72bfdf5ae3
-Patch100: %{name}-branch.diff
+Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: affb74174c6e3eda2c0748d6c052c8ff
+#Patch100: %{name}-branch.diff
BuildRequires: SDL-devel
-BuildRequires: automake
BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: db-cxx-devel
BuildRequires: gettext-devel
-BuildRequires: kdebase-devel >= 9:%{_ver}
-%{?with_kdegames:BuildRequires: kdegames-devel >= 8:%{_ver}}
-BuildRequires: kdemultimedia-devel >= 9:%{_ver}
-BuildRequires: kdenetwork-devel >= 10:%{_ver}
-BuildRequires: kdepim-devel >= 3:%{_ver}
+BuildRequires: kdebase-devel >= %{_minbaseevr}
+%{?with_kdegames:BuildRequires: kdegames-devel >= %{_mingamesevr}}
+BuildRequires: kdemultimedia-devel >= %{_minmultimediaevr}
+BuildRequires: kdenetwork-devel >= %{_minnetworkevr}
+BuildRequires: kdepim-devel >= %{_minpimevr}
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: mdns-bonjour-devel
@@ -77,7 +80,7 @@
Summary: Atlantik board designer
Summary(pl): Program do tworzenia plansz dla gry Atlantik
Group: X11/Applications/Games
-Requires: kdegames-atlantik >= 8:%{_ver}
+Requires: kdegames-atlantik >= %{_mingamesevr}
%description atlantikdesigner
Atlantik board designer.
@@ -89,7 +92,7 @@
Summary: FSView - a tool for showing disc utilization in a graphical form
Summary(pl): FSview - narzędzie do graficznego przedstawiania wolnego
miejsca na dysku
Group: X11/Applications
-Requires: konqueror >= 9:%{_ver}
+Requires: konqueror >= %{_minbaseevr}
%description fsview
FSView is a tool for showing disc utilization in a graphical form,
@@ -105,7 +108,7 @@
Summary(pl): Wtyczki do kaddressbook
Summary(pt_BR): Plugins para kaddressbook
Group: X11/Applications
-Requires: kdepim-kaddressbook >= 3:%{_ver}
+Requires: kdepim-kaddressbook >= %{_minkdepimevr}
%description kaddressbook-plugins
Plugins for kaddressbook.
@@ -125,7 +128,7 @@
Summary(pl): Wtyczki do edytora tekstu Kate
Summary(pt_BR): Plugins para kdebase-kate
Group: X11/Applications
-Requires: kdebase-kate >= 9:%{_ver}
+Requires: kdebase-kate >= %{_minbaseevr}
%description kate
kdeaddons-kate contains plugins extending the functionality of the
@@ -151,7 +154,7 @@
Summary(pl): Wtyczki i dodatkowe aplety do Kickera (panelu KDE)
Summary(pt_BR): Plugins para kdebase-kicker
Group: X11/Applications
-Requires: kdebase-desktop >= 9:%{_ver}
+Requires: kdebase-desktop >= %{_minbaseevr}
%description kicker
Plugins and additional applets for Kicker (the KDE panel).
@@ -169,7 +172,7 @@
Summary: Scripts extending the functionality of KNewsTicker
Summary(pl): Skrypty rozszerzające funkcjonalność KNewsTickera
Group: X11/Applications
-Requires: kdenetwork-knewsticker >= 10:%{_ver}
+Requires: kdenetwork-knewsticker >= %{_minnetworkevr}
%description knewsticker
Scripts extending the functionality of KNewsTicker.
@@ -183,7 +186,7 @@
Summary(pl): Wtyczki rozszerzające funkcjonalność Konquerora
Summary(pt_BR): Plugins para konqueror
Group: X11/Applications
-Requires: konqueror >= 9:%{_ver}
+Requires: konqueror >= %{_minbaseevr}
%description konqueror
Plugins extending the functionality of Konqueror. %{name}-konqueror
@@ -206,7 +209,7 @@
Summary: A signature creator and manager
Summary(pl): Program tworzący i zarządzający podpisami
Group: X11/Applications
-Requires: kdebase-core >= 9:%{_ver}
+Requires: kdebase-core >= %{_minbaseevr}
%description ksig
A signature creator and manager.
@@ -218,7 +221,7 @@
Summary: Windows link file forwarder
Summary(pl): Przekierowywacz skrótów windowsowych
Group: X11/Applications
-Requires: kdebase-core >= 9:%{_ver}
+Requires: kdebase-core >= %{_minbaseevr}
%description lnkforward
A konqueror extension that makes windows .lnk files work under Linux.
@@ -233,7 +236,7 @@
Summary(pl): Wtyczki rozszerzające funkcjonalność odtwarzacza noatun
Summary(pt_BR): Plugins para kdemultimedia-noatun
Group: X11/Applications
-Requires: kdemultimedia-noatun >= 9:%{_ver}
+Requires: kdemultimedia-noatun >= %{_minmultimediaevr}
%description noatun
Plugins extending the functionality of the noatun media player.
@@ -290,9 +293,11 @@
kde_libs_htmldir=%{_kdedocdir} \
kde_htmldir=%{_kdedocdir}
+%if 0
# Debian manpages
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%endif
mv $RPM_BUILD_ROOT%{_iconsdir}/{lo,hi}color/16x16/apps/autorefresh.png
@@ -317,7 +322,7 @@
%{_datadir}/apps/atlantikdesigner
%{_desktopdir}/kde/atlantikdesigner.desktop
%{_iconsdir}/*/*/*/atlantikdesigner.png
-%{_mandir}/man1/atlantikdesigner.1*
+#%{_mandir}/man1/atlantikdesigner.1*
%endif
%files fsview
@@ -328,7 +333,7 @@
%{_datadir}/apps/fsview
%{_datadir}/services/fsview_part.desktop
%{_iconsdir}/*/*/apps/fsview.png
-%{_mandir}/man1/fsview.1*
+#%{_mandir}/man1/fsview.1*
%files kaddressbook-plugins
%defattr(644,root,root,755)
@@ -520,9 +525,11 @@
%{_iconsdir}/crystalsvg/*/actions/webarchiver.png
%{_iconsdir}/crystalsvg/*/apps/konqsidebar_mediaplayer.png
%{_iconsdir}/crystalsvg/*/apps/konqsidebar_delicious.png
-%{_mandir}/man1/exif.py.1*
-%{_mandir}/man1/jpegorient.1*
-%{_mandir}/man1/orient.py.1*
+%{_iconsdir}/*/*/apps/metabar.png
+%{_iconsdir}/*/*/apps/metabar.svgz
+#%{_mandir}/man1/exif.py.1*
+#%{_mandir}/man1/jpegorient.1*
+#%{_mandir}/man1/orient.py.1*
# TODO - requires kdenetwork-{knewsticker,rss}
%{_libdir}/kde3/konq_sidebarnews.la
%attr(755,root,root) %{_libdir}/kde3/konq_sidebarnews.so
@@ -546,7 +553,7 @@
%{_datadir}/apps/ksig
%{_desktopdir}/kde/ksig.desktop
%{_iconsdir}/*/*/apps/ksig.png
-%{_mandir}/man1/ksig.1*
+#%{_mandir}/man1/ksig.1*
%files lnkforward
%defattr(644,root,root,755)
@@ -559,7 +566,7 @@
%{_datadir}/apps/khtml/kpartplugins/plugin_rellinks.rc
%{_datadir}/mimelnk/application/x-win-lnk.desktop
%{_datadir}/services/kfile_lnk.desktop
-%{_mandir}/man1/lnkforward.1*
+#%{_mandir}/man1/lnkforward.1*
%files noatun
%defattr(644,root,root,755)
@@ -598,9 +605,9 @@
%attr(755,root,root) %{_libdir}/kde3/noatunwavecapture.so
%{_datadir}/apps/noatun/*
%{_iconsdir}/crystalsvg/*/apps/synaescope.png
-%{_mandir}/man1/noatunsynaescope.bin.1*
-%{_mandir}/man1/noatuntippecanoe.bin.1*
-%{_mandir}/man1/noatuntyler.bin.1*
+#%{_mandir}/man1/noatunsynaescope.bin.1*
+#%{_mandir}/man1/noatuntippecanoe.bin.1*
+#%{_mandir}/man1/noatuntyler.bin.1*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -608,8 +615,23 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.120 2006/04/01 17:05:45 glen
+- merged 3.5.2 from AC-branch
+
Revision 1.119 2006/03/19 20:11:03 freetz
- require virtual mdns-bonjour-devel, rel.2
+
+Revision 1.118.2.4 2006/04/01 17:01:38 glen
+- kdepim epoch is now 9
+
+Revision 1.118.2.3 2006/04/01 17:00:41 glen
+- unify macros
+
+Revision 1.118.2.2 2006/03/29 13:07:13 glen
+- really 3.5.2 (previous commit was accident)
+
+Revision 1.118.2.1 2006/03/29 11:28:58 glen
+- 3.5.2
Revision 1.118 2006/01/25 16:35:10 pluto
- disable all-in-one compilation.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdeaddons.spec?r1=1.119&r2=1.120&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
