rpms/kdeaddons/devel .cvsignore, 1.34, 1.35 kdeaddons.spec, 1.68, 1.69 sources, 1.37, 1.38 kdeaddons-3.5.1-rgb.txt-path.patch, 1.1, NONE kdeaddons-3.5.3-sdl.patch, 1.1, NONE metabarrc, 1.1, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Fri Dec 14 01:55:20 UTC 2007
Author: kkofler
Update of /cvs/pkgs/rpms/kdeaddons/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19725/devel
Modified Files:
.cvsignore kdeaddons.spec sources
Removed Files:
kdeaddons-3.5.1-rgb.txt-path.patch kdeaddons-3.5.3-sdl.patch
metabarrc
Log Message:
Import the kdeaddons3 specfile I've been maintaining in parallel, with the following new changes:
* Fri Dec 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.8-4
- rename (yet again) to kdeaddons as there's no kdeaddons4
- 3.5.8
- bump Release to be greater than last full kdeaddons build
- kdeaddons-atlantikdesigner Obsoletes kdeaddons-extras
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 16 Oct 2007 15:07:35 -0000 1.34
+++ .cvsignore 14 Dec 2007 01:54:41 -0000 1.35
@@ -1,3 +1 @@
-metabar-fedora.tar.bz2
-kdeaddons-3.5.7.tar.bz2
kdeaddons-3.5.8.tar.bz2
Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdeaddons.spec 11 Dec 2007 13:56:50 -0000 1.68
+++ kdeaddons.spec 14 Dec 2007 01:54:41 -0000 1.69
@@ -1,77 +1,45 @@
+# THIS SPECFILE IS FOR F9+ ONLY!
+# Sorry, it is just too different for conditionals to be worth it.
+
+# Compile only atlantikdesigner
+%define donotcompilelist doc kaddressbook-plugins kate kfile-plugins kicker-applets knewsticker-scripts konq-plugins ksig noatun-plugins renamedlgplugins
Name: kdeaddons
Summary: K Desktop Environment - Plugins
Version: 3.5.8
-Release: 3%{?dist}
-
+Release: 4%{?dist}
License: GPLv2
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
-Source2: metabarrc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
-Patch3: kdeaddons-3.5.3-sdl.patch
-
-BuildRequires: kdebase3-devel >= %{version}
+BuildRequires: kdelibs3-devel >= %{version}
BuildRequires: kdegames3-devel >= %{version}
-%if 0%{?fedora} < 9
-BuildRequires: kdemultimedia3-devel >= %{version}
-%endif
-BuildRequires: kdepim3-devel >= %{version}
-BuildRequires: SDL-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: openssl-devel
-BuildRequires: db4-devel
-BuildRequires: xmms-devel
-
-Requires: kdebase3 >= %{version}
-# used in jpegorient (#312641)
-Requires: python-exif
-Requires: which
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-Obsoletes: %{name}-xmms < %{version}-%{release}
%description
-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
+Plugins for some KDE applications.
-%package extras
-Group: User Interface/Desktops
-Summary: Extras packages from kdeaddons
-Requires: %{name} = %{version}-%{release}
+%package atlantikdesigner
+Group: Amusements/Games
+Summary: Atlantik Designer
+Requires: kdelibs3 >= %{version}
Requires: kdegames3 >= %{version}
-Obsoletes: %{name}-atlantikdesigner < %{version}-%{release}
-%description extras
-This package includes:
-* atlantikdesigner: game board designer
-%if 0%{?fedora} < 9
-* noatun-plugins
-%endif
+# directory ownership
+Requires: hicolor-icon-theme
+Obsoletes: kdeaddons-extras < %{version}-%{release}
-%prep
-%setup -q -a 1
+%description atlantikdesigner
+This package includes a game board designer for Atlantik.
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%patch2 -p0 -b .rgb.txt-path
-%endif
-%patch3 -p1 -b .sdl
+%prep
+%setup -q -n kdeaddons-%{version}
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-%if 0%{?fedora} >= 9
-export DO_NOT_COMPILE="noatun-plugins"
-%endif
+export DO_NOT_COMPILE="%{donotcompilelist}"
%configure \
--includedir=%{_includedir}/kde \
@@ -85,59 +53,17 @@
%install
rm -rf %{buildroot}
+mkdir %{buildroot}
+export DO_NOT_COMPILE="%{donotcompilelist}"
make install DESTDIR=%{buildroot}
-# File lists for locale
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}/$HTML_DIR ]; then
- for lang_dir in %{buildroot}/$HTML_DIR/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
- # replace absolute symlinks with relative ones
- pushd $lang_dir
- for i in *; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
- done
- popd
- fi
- done
-fi
-
-# rpmdocs
-for dir in konq-plugins ; do
- for file in AUTHORS ChangeLog README TODO ; do
- test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
- done
-done
-
-# install fedora metabar theme
-cp -prf fedora %{buildroot}%{_datadir}/apps/metabar/themes
-install -m644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/
-
-
-%post
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-/sbin/ldconfig
-for f in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%post extras
+%post atlantikdesigner
touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-%postun extras
+%postun atlantikdesigner
touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
@@ -146,104 +72,47 @@
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files atlantikdesigner
%defattr(-,root,root,-)
-%doc README
-%doc rpmdocs/*
-%{_bindir}/*
-%{_libdir}/kde3/*
-%{_datadir}/applications/kde/*
-%{_datadir}/applnk/.hidden/*
-%{_datadir}/apps/akregator/pics/*
-%{_datadir}/apps/domtreeviewer/
-%{_datadir}/apps/fsview/
-%{_datadir}/apps/imagerotation/
-%{_datadir}/apps/kaddressbook/*
-%{_datadir}/apps/kate/*
-%{_datadir}/apps/katepart/syntax/*
-%{_datadir}/apps/katexmltools
-# 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/*/*/*/*
-%dir %{_datadir}/apps/konqueror/kpartplugins/
-%{_datadir}/apps/konqueror/kpartplugins/*
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/konqsidebartng/*/*
-%{_datadir}/apps/mediacontrol/
-%{_datadir}/apps/metabar/
-%{_datadir}/apps/microformat/
-%{_datadir}/apps/kicker/applets/*
-%{_datadir}/apps/ksig/
-%{_datadir}/config*/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/mimelnk/*/*
-%{_datadir}/service*/*
-
-# atlantikdesigner
-%exclude %{_bindir}/atlantikdesigner
-%exclude %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
-%exclude %{_datadir}/applications/kde/atlantikdesigner.desktop
-
-%if 0%{?fedora} < 9
-# noatun-plugins
-%exclude %{_bindir}/noatun*
-%exclude %{_libdir}/kde3/noatun*
-%endif
-
-
-%files extras
-%defattr(-,root,root,-)
-
-# atlantikdesigner
-%doc atlantikdesigner/TODO
+%doc README COPYING-DOCS atlantikdesigner/TODO
%{_bindir}/atlantikdesigner
%{_datadir}/apps/atlantikdesigner/
%{_datadir}/icons/hicolor/*/*/atlantikdesigner*
%{_datadir}/applications/kde/atlantikdesigner.desktop
-%if 0%{?fedora} < 9
-# noatun-plugins
-%{_bindir}/noatun*
-%{_libdir}/kde3/noatun*
-%{_datadir}/apps/noatun/*
-%endif
-
%changelog
-* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.8-4
-- disable noatun plugins (F9+)
-
-* Wed Oct 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.8-2
-- -extras: Requires: kdegames3
-
-* Tue Oct 16 2007 Than Ngo <than at redhat.com> 3.5.8-1
+* Fri Dec 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.8-4
+- rename (yet again) to kdeaddons as there's no kdeaddons4
- 3.5.8
+- bump Release to be greater than last full kdeaddons build
+- kdeaddons-atlantikdesigner Obsoletes kdeaddons-extras
-* Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-6
-- Requires: which python-exif (#312641)
-
-* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.7-5
-- License: GPLv2
-- (Build)Requires: kdebase3(-devel) kdegames3-devel kdemultimedia3-devel kdepim3-devel
-
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.5.7-4
-- Rebuild for selinux ppc32 issue.
-
-* 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 Jul 28 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.7-5
+- fix post and postun scriptlets to run for the subpackage
+- don't run update-desktop-database because no MIME types are touched
+
+* Fri Jul 27 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.7-4
+- rename (again) to kdeaddons3
+- build (only) kdeaddons3-atlantikdesigner subpackage
+- Conflicts with pre-KDE-4 kdeaddons-extras
+- add Requires on hicolor-icon-theme for directory ownership
+- remove Requires({pre,post}): ldconfig because no shared libs are shipped
+
+* Tue Jul 17 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.7-3
+- rename to atlantikdesigner
+- package only atlantikdesigner, remove everything else
+- change R/BR to kde{libs,games}3(-devel)
+- add mkdir %%{buildroot} after the rm -rf %%{buildroot}
* 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
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 16 Oct 2007 15:07:49 -0000 1.37
+++ sources 14 Dec 2007 01:54:41 -0000 1.38
@@ -1,2 +1 @@
-0bec436d63d3d04878c1231061326d4a metabar-fedora.tar.bz2
4a338f14210ad920bb54624cd330dd89 kdeaddons-3.5.8.tar.bz2
--- kdeaddons-3.5.1-rgb.txt-path.patch DELETED ---
--- kdeaddons-3.5.3-sdl.patch DELETED ---
--- metabarrc DELETED ---
More information about the fedora-extras-commits
mailing list