rpms/digikam/EL-5 .cvsignore, 1.9, 1.10 digikam.spec, 1.32, 1.33 sources, 1.9, 1.10
Rex Dieter
rdieter at fedoraproject.org
Sun Sep 21 21:08:41 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10113
Modified Files:
.cvsignore digikam.spec sources
Log Message:
sync w/devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 14 Dec 2007 13:13:25 -0000 1.9
+++ .cvsignore 21 Sep 2008 21:08:11 -0000 1.10
@@ -1 +1 @@
-digikam-0.9.2-final.tar.bz2
+digikam-0.9.4.tar.bz2
Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- digikam.spec 14 Dec 2007 13:13:25 -0000 1.32
+++ digikam.spec 21 Sep 2008 21:08:11 -0000 1.33
@@ -1,30 +1,41 @@
-%define alphatag final
Name: digikam
-Version: 0.9.2
-Release: 1%{?dist}
+Version: 0.9.4
+Release: 2%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.digikam.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: digikam-0.9.2-beta3-desktop-utf8-fix.patch
-# http://bugs.kde.org/148930
-Patch148930: digikam-0.9.2-kde#148930.patch
-
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: kdelibs-devel
-BuildRequires: gphoto2-devel >= 2.0.0
-BuildRequires: libkexiv2-devel >= 0.1.5 libkdcraw-devel >= 0.1.1 libkipi-devel
-BuildRequires: lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel
-BuildRequires: sqlite-devel >= 3.0.0
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+%if 0%{?fedora} > 6
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: kdelibs-devel
+%endif
+%if 0%{?fedora} > 9
+BuildRequires: libgphoto2-devel
+%else
+BuildRequires: gphoto2-devel
+%endif
+BuildRequires: jasper-devel
+BuildRequires: libkdcraw-devel >= 0.1.4
+BuildRequires: libkexiv2-devel >= 0.1.7
+BuildRequires: libkipi-devel >= 0.1.6
+BuildRequires: lcms-devel
+BuildRequires: libtiff-devel
+BuildRequires: libpng-devel >= 1.2.7
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
%endif
+BuildRequires: sqlite-devel
+
+Provides: digikamimageplugins = %{version}-%{release}
+Obsoletes: digikamimageplugins < 0.9.1-2
%description
digiKam is an easy to use and powerful digital photo management application,
@@ -47,11 +58,10 @@
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.
+
%prep
-%setup -q -n %{name}-%{version}-%{alphatag}
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
-%patch0 -p1
-%patch148930 -p1 -b .kde#148930
%build
unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -62,9 +72,12 @@
--disable-debug \
--disable-warnings \
--disable-dependency-tracking \
- --enable-final
+ --enable-final \
+ --without-included-sqlite3
+
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -79,14 +92,21 @@
--add-category Photography \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop
-%find_lang %{name}
+%find_lang %{name} || touch %{name}.lang
rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la
+# Create symlinks in pixmaps directory
+# FIXME: this shouldn't be necessary anymore -- Rex
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -sf ../icons/hicolor/48x48/apps/digikam.png \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/digikam.png
+ln -sf ../icons/hicolor/48x48/apps/showfoto.png \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/showfoto.png
+
%post
/sbin/ldconfig
update-desktop-database &> /dev/null ||:
-
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -95,15 +115,16 @@
%postun
/sbin/ldconfig
update-desktop-database &> /dev/null ||:
-
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
@@ -119,6 +140,7 @@
%{_datadir}/apps/showfoto/
%{_datadir}/icons/hicolor/*/*/*
%{_mandir}/man1/*.1*
+%{_datadir}/pixmaps/*.png
%{_datadir}/services/digikam*
%{_datadir}/servicetypes/digikamimageplugin.desktop
@@ -128,23 +150,71 @@
%{_includedir}/digikam_export.h
%{_libdir}/libdigikam.so
+
%changelog
-* Fri Dec 14 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-1
-- Update to 0.9.2-final
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-2
+- --without-included-sqlite3, BR: sqlite-devel
+
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-1
+- digikam-0.9.4
+
+* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-5
+- Don't lose some photos during import (#448235)
+
+* Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- respin (for libkdcraw)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.3-2
+- Autorebuild for GCC 4.3
+
+* Sat Dec 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.3-1
+- Update to 0.9.3
+- BR: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.5.rc1
+- digikam-0.9.3-rc1
+- BR: kdelibs3-devel
+
+* Thu Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.2.beta3
+- digikam-0.9.3-beta3
+
+* Tue Nov 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.1.beta2
+- digikam-0.9.3-beta2
+
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-5
+- Rebuild
+
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-4
- License: GPLv2+
- lcms patch (kde bug #148930)
-- Update description
-- preserve upstream .desktop vendor
-- cleanup/simplify BR's,Requires,d-f-i usage
-* Sat Jun 30 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-3
-- Delete original .desktop
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.9.2-3
+- Rebuild for selinux ppc32 issue.
+
+* Fri Jun 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-2
+- Create symlinks in pixmaps directory (#242978)
+
+* Tue Jun 19 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-1
+- Update to version 0.9.2-final
+- Remove digikam-0.9.2-beta3-fix-exiv2-dep.patch, merged upstream
+
+* Wed Jun 06 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.3.beta3
+- Fix .desktop category
-* Fri Jun 29 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-2
-- Fix .desktop category and encoding (#240644)
+* Wed Jun 06 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.2.beta3
+- Fix broken compilation caused by Exiv2 dependency
-* Sun Mar 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-1.1
-- respin (for jasper)
+* Tue Jun 05 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.1.beta3
+- Update to version 0.9.2-beta3 (merge with digikamimageplugins)
+- Update description
+
+* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-3
+- respin against libkexiv2-0.1.5
+- preserve upstream .desktop vendor (f7 branch at least)
+
+* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-2
+- exiv2-0.14 patch
+- cleanup/simplify BR's,Requires,d-f-i usage
* Fri Mar 09 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-1
- Update to version 0.9.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 14 Dec 2007 13:13:25 -0000 1.9
+++ sources 21 Sep 2008 21:08:11 -0000 1.10
@@ -1 +1 @@
-0f67edf65c394c96cb60d48e4e2bfebd digikam-0.9.2-final.tar.bz2
+b0f3fa00bd054b0497146e6ce24dab7c digikam-0.9.4.tar.bz2
More information about the fedora-extras-commits
mailing list