- up to kde 4.7.0

Changed files:
    kde-ac260-lt.patch -> 1.2
    kde-am.patch -> 1.2
    kde4-libkdcraw.spec -> 1.12

diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644 (file)
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in     2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in

diff --git a/kde-am.patch b/kde-am.patch
deleted file mode 100644 (file)
index 5a23f3a..0000000
--- a/kde-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.10/admin/cvs.sh~       2008-08-19 23:28:39.000000000 +0300
-+++ kdelibs-3.5.10/admin/cvs.sh        2009-05-19 13:34:47.966210297 +0300
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;

diff --git a/kde4-libkdcraw.spec b/kde4-libkdcraw.spec
index 52b2eb4030a7f309981b69b9d33688f9684d9922..31a182213dea55711feea76ef4579a194eed1b15 100644 (file)
--- a/kde4-libkdcraw.spec
+++ b/kde4-libkdcraw.spec
@@ -1,27 +1,23 @@
+%define         _state          stable
+%define                orgname         libkdcraw
+%define         qtver           4.7.3
+
 Summary:       KDcraw libary
 Summary(pl.UTF-8):     Biblioteka KDcraw
 Name:          libkdcraw
-Version:       0.1.4
-Release:       2
+Version:       4.7.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Libraries
-Source0:       http://downloads.sourceforge.net/kipi/%{name}-%{version}.tar.bz2
-# Source0-md5: 4fa5de407e9acf2eb5650d3fb5836f7d
-Patch0:                kde-ac260-lt.patch
-Patch1:                kde-am.patch
-URL:           http://www.kipi-plugins.org/drupal/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gettext-devel
-BuildRequires: kdelibs-devel >= 9:3.2.0
+Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5: 8e5ea3fa1c714251e75dd227ad0d01b8
+URL:           http://www.kde.org/
 BuildRequires: lcms-devel
 BuildRequires: libjpeg-devel
 BuildRequires: rpmbuild(macros) >= 1.164
+Obsoletes:     kde4-libkdcraw
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# build broken with spaces in CC
-%undefine      with_ccache
-
 %description
 The KDcraw Library is part of the KIPI Project.
 
@@ -33,7 +29,7 @@ Summary:      Header files for libkdcraw development
 Summary(pl.UTF-8):     Pliki nagłówkowe dla programistów używających libkdcraw
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      kdelibs-devel >= 9:3.2.0
+Obsoletes:     kde4-libkdcraw-devel
 
 %description devel
 Header files for libkdcraw development.
@@ -43,41 +39,34 @@ Pliki nagłówkowe dla programistów używających libkdcraw.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common cvs
-%configure
+install -d build
+cd build
+%cmake \
+               -DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk \
+               ../
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       kde_htmldir=%{_kdedocdir} \
-       kde_libs_htmldir=%{_kdedocdir}
-
-%find_lang %{name} --all-name
+%{__make} -C build/ install \
+        DESTDIR=$RPM_BUILD_ROOT \
+        kde_htmldir=%{_kdedocdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libkdcraw.so.?.?.?
-%attr(755,root,root) %ghost %{_libdir}/libkdcraw.so.?
-%dir %{_libdir}/libkdcraw?
-%attr(755,root,root) %{_libdir}/libkdcraw?/kdcraw
-# is this needed by the program itself? dunno
-%{_libdir}/libkdcraw?/CAMERALIST
-%{_iconsdir}/hicolor/*x*/*/*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdcraw.so.??
+%attr(755,root,root) %{_libdir}/libkdcraw.so.*.*.*
+%{_datadir}/apps/libkdcraw
+%{_iconsdir}/hicolor/*x*/apps/kdcraw.png
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkdcraw.so
-%{_libdir}/libkdcraw.la
 %{_includedir}/libkdcraw
 %{_pkgconfigdir}/libkdcraw.pc