Author: shadzik Date: Mon Dec 18 13:19:38 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL - version 0.9.0
---- Files affected: SPECS: digikam.spec (1.52 -> 1.53) ---- Diffs: ================================================================ Index: SPECS/digikam.spec diff -u SPECS/digikam.spec:1.52 SPECS/digikam.spec:1.53 --- SPECS/digikam.spec:1.52 Wed Jul 19 00:34:09 2006 +++ SPECS/digikam.spec Mon Dec 18 14:19:32 2006 @@ -2,15 +2,16 @@ Summary: A KDE frontend for gphoto2 Summary(pl): Interfejs KDE do gphoto2 Name: digikam -Version: 0.8.2 +Version: 0.9.0 Release: 1 License: GPL Group: X11/Applications Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2 -# Source0-md5: fd57b7bfe4577dc2e2efd6d33122a46b +# Source0-md5: 5334d608218fe077a476722e2ce55323 URL: http://digikam.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: exiv2-devel >= 0.12 BuildRequires: gdbm-devel BuildRequires: imlib2-devel BuildRequires: kdelibs-devel @@ -18,6 +19,7 @@ BuildRequires: libgphoto2-devel BuildRequires: libkexif-devel >= 0.2 BuildRequires: libkipi-devel >= 0.1 +BuildRequires: libstdc++-devel BuildRequires: libtiff-devel BuildRequires: pkgconfig >= 1:0.9.0 BuildRequires: rpmbuild(macros) >= 1.129 @@ -49,6 +51,9 @@ %prep %setup -q + +%build + %{__sed} -i -e "s,Categories.*,Categories=Qt;KDE;Graphics;Photograph;," \ ./digikam/digikam/digikam.desktop \ ./digikam/showfoto/showfoto.desktop @@ -57,11 +62,14 @@ echo "# vi: encoding=utf-8" >> ./digikam/imageplugins/digikamimageplugin_core.desktop echo "# vi: encoding=utf-8" >> ./digikam/utilities/imageeditor/digikamimageplugin.desktop -%build cp -f /usr/share/automake/config.sub admin %{__make} -f admin/Makefile.common cvs %configure \ +%if "%{_lib}" == "lib64" + --enable-libsuffix=64 \ +%endif + --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \ --disable-rpath \ --with-qt-libraries=%{_libdir} \ --with-imlib2-config=%{_bindir} @@ -77,9 +85,6 @@ %find_lang %{name} --with-kde --all-name -# conflict with kdelibs -rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/image/x-raw.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -97,8 +102,10 @@ %{_datadir}/servicetypes/* %{_datadir}/apps/digikam %{_datadir}/apps/showfoto +%{_datadir}/apps/konqueror/servicemenus/digikam-*.desktop %{_desktopdir}/kde/*.desktop %{_iconsdir}/[!l]*/*/*/* +%{_mandir}/man1/digitaglinktree.1* %files devel %defattr(644,root,root,755) @@ -113,35 +120,59 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.52 2006/07/18 22:34:09 vip -- missing BR: sqlite3-devel +Revision 1.53 2006/12/18 13:19:32 shadzik +- merged from DEVEL +- version 0.9.0 + +Revision 1.42.2.15 2006/12/18 13:13:29 shadzik +- up to final 0.9.0, seems stable to me so... +- ... rel 1 +- ready to merge to HEAD + +Revision 1.42.2.14 2006/12/08 00:22:09 shadzik +- sort BRs, darekr shame on you :P + +Revision 1.42.2.13 2006/12/08 00:20:43 shadzik +- Br exiv2 +- builds + +Revision 1.42.2.12 2006/12/07 23:40:05 darekr +- BR: libstdc++-devel + +Revision 1.42.2.11 2006/12/07 22:04:41 shadzik +- 0.9.0-rc2 + +Revision 1.42.2.10 2006/11/21 22:01:52 shadzik +- 0.9.0rc1 -Revision 1.51 2006/07/18 22:02:36 shadzik -- build fix +Revision 1.42.2.9 2006/10/23 00:36:21 shadzik +- 0.9.0beta3 -Revision 1.50 2006/07/18 21:01:07 shadzik -- up to 0.8.2 +Revision 1.42.2.8 2006/09/20 11:10:12 qboosh +- files fix -Revision 1.49 2006/04/11 22:59:41 arekm -- rel 2; drop x-raw.desktop; conflicting with kdelibs +Revision 1.42.2.7 2006/09/20 09:02:59 shadzik +- add manpage for digitagtree -Revision 1.48 2006/03/09 09:11:40 glen -- altering source moved to %prep +Revision 1.42.2.6 2006/09/20 08:57:54 shadzik +- 0.9.0beta2 -Revision 1.47 2006/02/17 14:19:51 rotom -- updated to 0.8.1 +Revision 1.42.2.5 2006/07/21 11:30:33 shadzik +- up to 0.9.0-beta1 -Revision 1.46 2006/01/13 20:08:48 arekm -- rel 2 +Revision 1.42.2.4 2006/05/19 03:31:36 shadzik +- up to 0.8.2 RC1; not tested -Revision 1.45 2005/12/30 20:00:33 maciek2w -- packaged digikam.desktop +Revision 1.42.2.3 2005/12/09 14:55:03 paszczus +- updated to 0.8.0 +- ready to merge -Revision 1.44 2005/12/30 16:35:36 pawelk -- version 0.8.0 +Revision 1.42.2.2 2005/08/22 22:04:41 paszczus +- commented files are back -Revision 1.43 2005/10/30 12:19:51 arekm -- rel 2 +Revision 1.42.2.1 2005/08/22 21:56:01 paszczus +- updated to 0.8.0 (snap 2005-08-22) +- added BR: sqlite3-devel Revision 1.42 2005/08/22 19:01:58 arekm - up to 0.7.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/digikam.spec?r1=1.52&r2=1.53&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
