rpms/digikam/F-10 digikam.spec,1.79,1.80
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 5 17:33:08 UTC 2009
- Previous message (by thread): rpms/hplip/F-11 hplip-3.9.8.tar.gz.asc, NONE, 1.1 upstream-key.gpg, NONE, 1.1 .cvsignore, 1.32, 1.33 hplip.spec, 1.212, 1.213 sources, 1.32, 1.33 hplip-dbus.patch, 1.1, NONE hplip-desktop.patch, 1.7, NONE hplip-device-id.patch, 1.4, NONE hplip-disc-media.patch, 1.2, NONE hplip-libsane.patch, 1.6, NONE hplip-marker-supply.patch, 1.9, NONE hplip-no-root-config.patch, 1.10, NONE hplip-resolution-405400.patch, 1.1, NONE hplip-segfault.patch, 1.2, NONE
- Next message (by thread): rpms/kdeaccessibility/F-11 .cvsignore,1.41,1.42 sources,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/digikam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24052
Modified Files:
digikam.spec
Log Message:
* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
- rebuild against kde-4.3
- optimize scriptlets
- tighten -libs related deps via %{?_isa}
Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- digikam.spec 17 Mar 2009 18:00:24 -0000 1.79
+++ digikam.spec 5 Aug 2009 17:33:08 -0000 1.80
@@ -1,7 +1,7 @@
Name: digikam
Version: 0.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
@@ -20,13 +20,12 @@ BuildRequires: libkipi-devel >= 0.3.0
BuildRequires: jasper-devel
# marble integration, http://bugzilla.redhat.com/470578
-BuildRequires: kdeedu-devel >= 4.2.0
-Requires: kdeedu-marble >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version}
BuildRequires: kdelibs4-devel
-# Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
+# min kdelibs Req
%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
-#Requires: kdelibs4 >= %{kde4_version}
# trash protocol support needed
# FIXME: should probably be handled lower in the stack
@@ -41,9 +40,7 @@ BuildRequires: sqlite-devel
Obsoletes: digikamimageplugins < 0.9.1-2
-Requires: %{name}-libs = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description
digiKam is an easy to use and powerful digital photo management application,
@@ -61,13 +58,15 @@ to use them.
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version}
%description libs
%{summary}.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.
@@ -108,12 +107,18 @@ desktop-file-validate %{buildroot}%{_dat
%post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ update-desktop-database -q &> /dev/null
+ touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%post libs -p /sbin/ldconfig
@@ -141,7 +146,8 @@ rm -rf %{buildroot}
%files libs
%defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libdigikamcore.so.1*
+%{_kde4_libdir}/libdigikamdatabase.so.1*
%files devel
%defattr(-,root,root,-)
@@ -151,6 +157,11 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
+- rebuild against kde-4.3
+- optimize scriptlets
+- tighten -libs related deps via %%{?_isa}
+
* Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
- digikam-0.10.0 (final)
- Previous message (by thread): rpms/hplip/F-11 hplip-3.9.8.tar.gz.asc, NONE, 1.1 upstream-key.gpg, NONE, 1.1 .cvsignore, 1.32, 1.33 hplip.spec, 1.212, 1.213 sources, 1.32, 1.33 hplip-dbus.patch, 1.1, NONE hplip-desktop.patch, 1.7, NONE hplip-device-id.patch, 1.4, NONE hplip-disc-media.patch, 1.2, NONE hplip-libsane.patch, 1.6, NONE hplip-marker-supply.patch, 1.9, NONE hplip-no-root-config.patch, 1.10, NONE hplip-resolution-405400.patch, 1.1, NONE hplip-segfault.patch, 1.2, NONE
- Next message (by thread): rpms/kdeaccessibility/F-11 .cvsignore,1.41,1.42 sources,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list