packages (DEVEL): digikam/digikam.spec - updated to 1.0.0-beta1 - commented...
paszczus
paszczus at pld-linux.org
Tue Jun 30 10:09:54 CEST 2009
Author: paszczus Date: Tue Jun 30 08:09:54 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- updated to 1.0.0-beta1
- commented out BR: kde4-kdeedu-devel (seems to not needed anymore)
---- Files affected:
packages/digikam:
digikam.spec (1.72.4.4 -> 1.72.4.5)
---- Diffs:
================================================================
Index: packages/digikam/digikam.spec
diff -u packages/digikam/digikam.spec:1.72.4.4 packages/digikam/digikam.spec:1.72.4.5
--- packages/digikam/digikam.spec:1.72.4.4 Sun Nov 4 16:10:01 2007
+++ packages/digikam/digikam.spec Tue Jun 30 10:09:48 2009
@@ -1,33 +1,39 @@
# $Revision$, $Date$
-
-%define beta beta2
+#
+%define qtver 4.5.1
+%define kdever 4.2.4
+%define state beta1
Summary: A KDE frontend for gphoto2
Summary(pl.UTF-8): Interfejs KDE do gphoto2
Name: digikam
-Version: 0.9.3
-Release: 0.%{beta}.1
+Version: 1.0.0
+Release: 0.%{state}.1
License: GPL
-Group: X11/Applications
-Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}-%{beta}.tar.bz2
-# Source0-md5: 7277c393c1171a53b80dfd576670f251
-Patch0: kde-ac260-lt.patch
-URL: http://digikam.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: exiv2-devel >= 0.14
-BuildRequires: jasper-devel >= 1.7.0
-BuildRequires: kdelibs-devel
+Group: X11/Applications/Graphics
+Source0: http://dl.sourceforge.net/digikam/%{name}-%{version}-%{state}.tar.bz2
+# Source0-md5: 6c0fd6fe7bb4d8a5f00c9a165c7b9309
+URL: http://www.digikam.org/
+Patch0: %{name}-link.patch
+BuildRequires: Qt3Support-devel >= %{qtver}
+BuildRequires: QtCore-devel >= %{qtver}
+BuildRequires: QtDesigner-devel >= %{qtver}
+BuildRequires: QtSql-devel >= %{qtver}
+BuildRequires: QtSvg-devel >= %{qtver}
+BuildRequires: automoc4
+BuildRequires: cmake >= 2.6.2
+BuildRequires: jasper-devel
+#BuildRequires: kde4-kdeedu-devel >= %{kdever}
+BuildRequires: kde4-kdegraphics-devel >= %{kdever}
+BuildRequires: kde4-kdepimlibs-devel >= %{kdever}
+BuildRequires: lcms-devel
+BuildRequires: lensfun-devel
BuildRequires: libgphoto2-devel
-BuildRequires: libkdcraw-devel >= 0.1.2
-BuildRequires: libkexiv2-devel >= 0.1.5
-BuildRequires: libkipi-devel >= 0.1
-BuildRequires: libstdc++-devel
-BuildRequires: libtiff-devel
BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: qt4-qmake >= %{qtver}
BuildRequires: rpmbuild(macros) >= 1.129
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel
+Requires: QtSql-sqlite3
Obsoletes: digikamimageplugins
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,8 +50,6 @@
Summary(pl.UTF-8): Interfejs KDE do gphoto2 - pliki nagłówkowe
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel
-Requires: libgphoto2-devel
%description devel
A KDE frontend for gphoto2 - header files.
@@ -54,41 +58,31 @@
Interfejs KDE do gphoto2 - pliki nagłówkowe.
%prep
-%setup -q -n %{name}-%{version}-%{beta}
-%patch0 -p1
-
-%{__sed} -i -e "s,Categories.*,Categories=Qt;KDE;Graphics;Photograph;," \
- ./digikam/digikam/digikam.desktop \
- ./digikam/showfoto/showfoto.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/digikam/digikam.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/showfoto/showfoto.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/imageplugins/digikamimageplugin_core.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/utilities/imageeditor/digikamimageplugin.desktop
+%setup -q -n %{name}-%{version}-%{state}
+%patch0 -p0
%build
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-
-%configure \
+install -d build
+cd build
+%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
+ -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
%if "%{_lib}" == "lib64"
- --enable-libsuffix=64 \
+ -DLIB_SUFFIX=64 \
%endif
- --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
- --disable-rpath \
- --with-qt-libraries=%{_libdir} \
- --with-imlib2-config=%{_bindir}
+ ../
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT \
kde_htmldir=%{_kdedocdir} \
kde_libs_htmldir=%{_kdedocdir}
-rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-
%find_lang %{name} --with-kde --all-name
%clean
@@ -100,22 +94,50 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
-%attr(755,root,root) %{_libdir}/kde3/*.so
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/apps/digikam
-%{_datadir}/apps/showfoto
-%{_datadir}/apps/konqueror/servicemenus/digikam-*.desktop
-%{_desktopdir}/kde/*.desktop
-%{_iconsdir}/[!l]*/*/*/*
+%attr(755,root,root) %{_bindir}/cleanup_digikamdb
+%attr(755,root,root) %{_bindir}/digikam
+%dir %{_datadir}/apps/digikam/utils
+%attr(755,root,root) %{_datadir}/apps/digikam/utils/digikam-camera
+%attr(755,root,root) %{_bindir}/digitaglinktree
+%attr(755,root,root) %{_bindir}/showfoto
+%attr(755,root,root) %ghost %{_libdir}/libdigikamdatabase.so.1
+%attr(755,root,root) %{_libdir}/libdigikamdatabase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdigikamcore.so.1
+%attr(755,root,root) %{_libdir}/libdigikamcore.so.*.*.*
+%attr(755,root,root) %{_libdir}/kde4/digikamimageplugin_*.so
+%attr(755,root,root) %{_libdir}/kde4/kio_digikamalbums.so
+%attr(755,root,root) %{_libdir}/kde4/kio_digikamdates.so
+%attr(755,root,root) %{_libdir}/kde4/kio_digikamsearch.so
+%attr(755,root,root) %{_libdir}/kde4/kio_digikamtags.so
%{_mandir}/man1/digitaglinktree.1*
+%{_mandir}/man1/cleanup_digikamdb.1*
+%dir %{_datadir}/apps/digikam
+%{_datadir}/apps/digikam/about
+%{_datadir}/apps/digikam/cameraui.rc
+%{_datadir}/apps/digikam/data
+%{_datadir}/apps/digikam/digikamimageplugin_*.rc
+%{_datadir}/apps/digikam/digikamimagewindowui.rc
+%{_datadir}/apps/digikam/digikamui.rc
+%{_datadir}/apps/digikam/icons
+%{_datadir}/apps/digikam/lighttablewindowui.rc
+%{_datadir}/apps/digikam/queuemgrwindowui.rc
+%{_datadir}/apps/digikam/themes
+%{_datadir}/apps/digikam/tips
+%{_datadir}/apps/showfoto
+%{_datadir}/kde4/services/digikamalbums.protocol
+%{_datadir}/kde4/services/digikamdates.protocol
+%{_datadir}/kde4/services/digikamimageplugin_*.desktop
+%{_datadir}/kde4/services/digikamsearch.protocol
+%{_datadir}/kde4/services/digikamtags.protocol
+%{_datadir}/apps/solid/actions/digikam-opencamera.desktop
+%{_datadir}/kde4/servicetypes/digikamimageplugin.desktop
+%{_iconsdir}/*/*/apps/*.png
+%{_desktopdir}/kde4/*.desktop
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libdigikamcore.so
+%attr(755,root,root) %{_libdir}/libdigikamdatabase.so
%{_includedir}/*.h
%{_includedir}/digikam
@@ -125,18 +147,122 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.72.4.4 2007/11/04 15:10:01 shadzik
-- 0.9.3-beta2
+Revision 1.72.4.5 2009/06/30 08:09:48 paszczus
+- updated to 1.0.0-beta1
+- commented out BR: kde4-kdeedu-devel (seems to not needed anymore)
+
+Revision 1.106 2009/04/29 22:11:55 shadzik
+- BR: QtDesigner-devel
+- rel 3
+
+Revision 1.105 2009/04/28 17:00:10 glen
+- build without debug code; rel 2
+
+Revision 1.104 2009/03/18 20:48:45 arekm
+- new url
+
+Revision 1.103 2009/03/18 18:42:30 arekm
+- add BR kdeedu-devel for libmarble
+
+Revision 1.102 2009/03/18 18:38:57 arekm
+- up to final 0.10.0
+
+Revision 1.101 2009/02/28 12:41:05 shadzik
+- %dir
+- rel .2
+
+Revision 1.100 2009/02/21 23:50:22 pawelz
+- BR seems to be complete, removed comment
+- R: QtSql-sqlite3
+
+Revision 1.99 2009/02/19 21:38:30 pawelz
+- up to 0.10 rc2
+- a lot of new BRs
+
+Revision 1.98 2009/01/26 08:37:27 arekm
+- up to 0.10.0 rc1
+
+Revision 1.97 2009/01/16 14:05:16 shadzik
+- beta8
+- cosmetics
+
+Revision 1.96 2009/01/16 12:56:47 shadzik
+- exclude scalable icons
+
+Revision 1.95 2009/01/05 20:58:22 glen
+- no sr at latin hacks
+
+Revision 1.94 2009/01/05 20:55:00 glen
+- packaging files
+
+Revision 1.93 2008/12/28 16:23:05 rotom
+- up to beta7
+
+Revision 1.92 2008/12/06 21:34:58 paszczus
+- updated to 0.10.0 beta6
+
+Revision 1.91 2008/11/24 19:48:29 paszczus
+- updated kde4 BRs
+
+Revision 1.90 2008/11/24 19:44:50 shadzik
+- cmake even higher (up to 2.6.2)
+- paszczus wanted to correct my commit, so count it as if he did
+
+Revision 1.89 2008/11/24 19:30:43 shadzik
+- BR; kde4-kdepimlibs-devel
+- updated Qt and cmake BR
+
+Revision 1.88 2008/11/24 19:02:43 paszczus
+- updated to 0.10.0 beta5
+- removed bogus BRs
+- added BRs: kde4-kdegraphics-devel, funlens-devel
+
+Revision 1.87 2008/08/09 12:24:17 paszczus
+- added few BRs; unifications
+
+Revision 1.86 2008/08/01 13:11:12 rotom
+- up to 0.10.0-beta2
+
+Revision 1.85 2008/07/26 19:04:19 rotom
+- install prefix added
+- section files fixed
+
+Revision 1.84 2008/07/25 07:39:39 arekm
+- more
+
+Revision 1.83 2008/07/25 07:31:15 arekm
+- raw; version for kde 3.5 on DIGIKAM_0_9
+
+Revision 1.82 2008/06/28 18:13:03 beorn
+- Up to 0.9.4rc1
+
+Revision 1.81 2008/05/04 11:26:18 hawk
+- fixed previous log entry
+
+Revision 1.80 2008-05-03 23:10:25 hawk
+- updated to 0.9.4-beta4, fixes build with libkdcraw 0.1.4
+
+Revision 1.79 2008-04-25 18:36:07 hawk
+- release 2
+
+Revision 1.78 2008-01-03 19:16:20 rotom
+- +x to digikam-camera script
+
+Revision 1.77 2007-12-30 19:24:58 rotom
+- 0.9.3
+- obsoletes lcms patch removed
+
+Revision 1.76 2007-11-03 23:27:05 ankry
+- sr at Latn -> sr at latin, rel. 6
-Revision 1.72.4.3 2007/10/20 17:04:17 shadzik
-- proper beta handling
-- builds
+Revision 1.75 2007/10/30 09:11:12 arekm
+- rel 5; fix build with new lcms
-Revision 1.72.4.2 2007/10/20 16:08:26 shadzik
-- updated BRs
+Revision 1.74 2007/10/21 17:47:01 arekm
+- rel 4; rebuild
-Revision 1.72.4.1 2007/10/20 00:24:17 wolvverine
-- up to 0.9.3 beta1
+Revision 1.73 2007/10/20 09:11:34 glen
+- group X11/Applications/Graphics
Revision 1.72 2007/10/19 17:53:43 shadzik
- reverted wolvverines commit
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/digikam/digikam.spec?r1=1.72.4.4&r2=1.72.4.5&f=u
More information about the pld-cvs-commit
mailing list