- up to kde 4.7.0

Changed files:
    kde-ac260-lt.patch -> 1.2
    kde-am.patch -> 1.2
    kde4-libkexiv2.spec -> 1.18

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-libkexiv2.spec b/kde4-libkexiv2.spec
index 797e2fb258d1cf83528e0bf39e7a8da773bf0d0a..ceafa603d2d54f5c4b8d7e45901d15e3bd57db74 100644 (file)
--- a/kde4-libkexiv2.spec
+++ b/kde4-libkexiv2.spec
@@ -1,25 +1,21 @@
+%define         _state          stable
+%define         orgname         libkexiv2
+%define         qtver           4.7.3
 Summary:       libkexiv2 - picture metadata manipulation library
 Summary(pl.UTF-8):     libkexiv2 - biblioteka do obróbki metadanych obrazków
 Name:          libkexiv2
-Version:       0.1.9
+Version:       4.7.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Libraries
-Source0:       http://downloads.sourceforge.net/kipi/%{name}-%{version}.tar.bz2
-# Source0-md5: 6e6fc9edbfad4506f6f59508d9aa45d6
-Patch0:                kde-ac260-lt.patch
-Patch1:                kde-am.patch
-URL:           http://www.kipi-plugins.org/drupal/
-BuildRequires: autoconf >= 2.53
-BuildRequires: automake >= 1.6.1
+Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5: a43d210bdfe3de3589b4ba7bfccc4855
+URL:           http://www.kde.org/
 BuildRequires: exiv2-devel >= 0.18
-BuildRequires: kdelibs-devel >= 9:3.4.0
+BuildRequires: kde4-kdelibs-devel
 BuildRequires: pkgconfig >= 0.9.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# build broken with spaces in CC
-%undefine      with_ccache
-
 %description
 Libkexiv2 is a KDE wrapper around Exiv2 library to manipulate pictures
 metadata. This library is used by kipi-plugins, digiKam and others
@@ -36,7 +32,6 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki %{name}
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      exiv2-devel
-Requires:      kdelibs-devel >= 9:3.4.0
 
 %description devel
 Header files for %{name} library.
@@ -46,19 +41,20 @@ Pliki nagłówkowe biblioteki %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%{__make} -f admin/Makefile.common cvs
-%configure
+install -d build
+cd build
+%cmake \
+       ../
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C build/ install \
+        DESTDIR=$RPM_BUILD_ROOT \
+        kde_htmldir=%{_kdedocdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,13 +64,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README RELEASE.rev
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libkexiv2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkexiv2.so.5
+%attr(755,root,root) %ghost %{_libdir}/libkexiv2.so.10
+%{_datadir}/apps/libkexiv2
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkexiv2.so
-%{_libdir}/libkexiv2.la
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libkexiv2.pc