SPECS: digikam.spec - more

[arekm]

Author: arekm                        Date: Fri Jul 25 07:39:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more

---- Files affected:
SPECS:
   digikam.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/digikam.spec
diff -u SPECS/digikam.spec:1.83 SPECS/digikam.spec:1.84
--- SPECS/digikam.spec:1.83	Fri Jul 25 09:31:15 2008
+++ SPECS/digikam.spec	Fri Jul 25 09:39:39 2008
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-%define		subrel	    rc1
-
 Summary:	A KDE frontend for gphoto2
 Summary(pl.UTF-8):	Interfejs KDE do gphoto2
 Name:		digikam
@@ -10,23 +8,14 @@
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/digikam/%{name}-%{version}-beta1.tar.bz2
 # Source0-md5:	15b4a4041d3200126b1eeea57361ccdd
-Patch0:		kde-ac260-lt.patch
 URL:		http://digikam.sourceforge.net/
+# FIXME - add new BR
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	exiv2-devel >= 0.14
-BuildRequires:	jasper-devel >= 1.7.0
-BuildRequires:	kdelibs-devel
-BuildRequires:	libgphoto2-devel
-BuildRequires:	libkdcraw-devel >= 0.1.4
-BuildRequires:	libkexiv2-devel >= 0.1.5
-BuildRequires:	libkipi-devel >= 0.1
-BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel
+BuildRequires:	automoc4
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel
 Obsoletes:	digikamimageplugins
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -45,8 +34,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.
@@ -56,28 +43,16 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta1
-%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
 
 %build
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-
-%configure \
+install -d build
+cd build
+%cmake \
 %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
@@ -138,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/digikam.spec?r1=1.83&r2=1.84&f=u