diff --git a/digikam-external-libs.patch b/digikam-external-libs.patch index 82fc674..75b9845 100644 --- a/digikam-external-libs.patch +++ b/digikam-external-libs.patch @@ -1,13 +1,13 @@ --- CMakeLists.txt.orig 2011-09-07 14:10:20.000000000 +0200 +++ CMakeLists.txt 2011-09-09 15:30:52.649954215 +0200 -@@ -79,12 +79,8 @@ +@@ -79,12 +79,7 @@ SET(KSANE_LOCAL_DIR extra/libksane) ENDIF() -SET(KFACE_LOCAL_DIR extra/libkface) -SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) -SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) - SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) +-SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) -ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(core) diff --git a/digikam.changes b/digikam.changes index 7c2dc84..6cbdf17 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 14 12:30:54 UTC 2011 - toddrme2178@gmail.com + +- Removed check for obsolete openSUSE version (fix for RPMLINT warning) +- Cleaned up spec file formatting + ------------------------------------------------------------------- Tue Oct 4 07:04:40 UTC 2011 - adrian@suse.de diff --git a/digikam.spec b/digikam.spec index 1729ed2..33a632e 100644 --- a/digikam.spec +++ b/digikam.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: digikam Version: 2.2.0 Release: 1 @@ -53,8 +51,8 @@ BuildRequires: shared-desktop-ontologies-devel BuildRequires: update-desktop-files %endif Requires: kipi-plugins >= 2.1.0 -Recommends: %{name}-lang Recommends: %{name}-doc +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -70,9 +68,7 @@ delete your images, is provided. %package doc Summary: Documentation of Digikam Group: Documentation/HTML -%if %suse_version > 1120 BuildArch: noarch -%endif %description doc This package contains the documentation for digikam @@ -110,13 +106,10 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so %endif %find_lang %{name} --all-name - %fdupes -s %{buildroot} - %kde_post_install -%post -p /sbin/ldconfig - +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files @@ -124,27 +117,25 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so %doc core/AUTHORS core/COPYING core/COPYING.DOC core/COPYING.LIB %doc core/ChangeLog core/NEWS core/README core/TODO %doc core/TODO.FACE core/TODO.MYSQLPORT +%{_kde4_applicationsdir}/digikam.desktop +%{_kde4_applicationsdir}/showfoto.desktop +%{_kde4_appsdir}/digikam/ +%{_kde4_appsdir}/showfoto/ +%{_kde4_appsdir}/solid %{_kde4_bindir}/cleanup_digikamdb %{_kde4_bindir}/digikam %{_kde4_bindir}/digitaglinktree %{_kde4_bindir}/showfoto +%{_kde4_iconsdir}/hicolor/*/apps/digikam.* +%{_kde4_iconsdir}/hicolor/*/apps/showfoto.* +%{_kde4_libdir}/libdigikamcore.so.* +%{_kde4_libdir}/libdigikamdatabase.so.* %{_kde4_modulesdir}/digikam*.so %{_kde4_modulesdir}/kio_digikamalbums.so %{_kde4_modulesdir}/kio_digikamdates.so %{_kde4_modulesdir}/kio_digikammapimages.so %{_kde4_modulesdir}/kio_digikamsearch.so %{_kde4_modulesdir}/kio_digikamtags.so -%{_kde4_libdir}/libdigikamcore.so.* -%{_kde4_libdir}/libdigikamdatabase.so.* -%{_kde4_applicationsdir}/digikam.desktop -%{_kde4_applicationsdir}/showfoto.desktop -%{_kde4_iconsdir}/hicolor/*/apps/digikam.* -%{_kde4_iconsdir}/hicolor/*/apps/showfoto.* -%{_kde4_appsdir}/digikam/ -%{_kde4_appsdir}/showfoto/ -%dir %{_kde4_appsdir}/solid -%dir %{_kde4_appsdir}/solid/actions -%{_kde4_appsdir}/solid/actions/digikam-opencamera.desktop %{_kde4_servicesdir}/digikamalbums.protocol %{_kde4_servicesdir}/digikamdates.protocol %{_kde4_servicesdir}/digikamimageplugin_*.desktop @@ -158,8 +149,8 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so %defattr(-,root,root,-) %doc %{_kde4_htmldir}/en/digikam/ %doc %{_kde4_htmldir}/en/showfoto/ -%doc %{_mandir}/man1/digitaglinktree.1%{ext_man} %doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man} +%doc %{_mandir}/man1/digitaglinktree.1%{ext_man} %files lang -f %{name}.lang %defattr(-,root,root,-)