rpms/kipi-plugins/devel .cvsignore, 1.31, 1.32 kipi-plugins.spec, 1.100, 1.101 sources, 1.31, 1.32 kipi-plugins-0.4.0-dt_validation.patch, 1.1, NONE kipi-plugins-0.6.0-s390x.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15312

Modified Files:
	.cvsignore kipi-plugins.spec sources 
Removed Files:
	kipi-plugins-0.4.0-dt_validation.patch 
	kipi-plugins-0.6.0-s390x.patch 
Log Message:
* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-1
- kipi-plugins-0.7.0
- -libs pkg, multilib friendly
- use %find_lang



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- .cvsignore	29 Aug 2009 17:50:22 -0000	1.31
+++ .cvsignore	28 Sep 2009 14:35:14 -0000	1.32
@@ -1 +1 @@
-kipi-plugins-0.6.0.tar.bz2
+kipi-plugins-0.7.0.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kipi-plugins.spec	12 Sep 2009 17:42:23 -0000	1.100
+++ kipi-plugins.spec	28 Sep 2009 14:35:14 -0000	1.101
@@ -2,8 +2,8 @@
 
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
-Version: 0.6.0
-Release: 2%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 
 License: GPLv2+ and Adobe
 Group:   Applications/Multimedia
@@ -11,10 +11,6 @@ Url:	 http://www.kipi-plugins.org/
 Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamed patches
-Patch100: kipi-plugins-0.4.0-dt_validation.patch
-Patch101: kipi-plugins-0.6.0-s390x.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 ## DNG converter
@@ -40,8 +36,9 @@ BuildRequires: expat-devel
 ## RemoveRedeye
 BuildRequires: opencv-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+# when -libs split happened
+Obsoletes: kipi-plugins < 0.7.0
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 ## jpeglossless plugin
 Requires: ImageMagick
@@ -70,13 +67,17 @@ FbExport           : export images to a 
 TimeAdjust         : adjust date and time
 PrintWizard        : print images in various format
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
-%patch100 -p1 -b .dt_validation
-%patch101 -p1 -b .s390x
-
 
 %build
 mkdir -p %{_target_platform}
@@ -92,17 +93,7 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-
-## File lists
-touch  %{name}.lang
-# locale's
-for app_file in %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/*.mo ; do
-   app=$(basename $app_file .mo)
-   # don't repeat
-   [ ! -f ${app}.lang ] && %find_lang ${app}
-done
-
-cat *.lang > %{name}-all.lang
+%find_lang %{name} --all-name --with-kde
 
 ## unpackaged files
 rm -f %{buildroot}%{_kde4_libdir}/lib*.so
@@ -118,12 +109,10 @@ rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null  ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -137,12 +126,15 @@ update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor >& /dev/null ||:
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen >& /dev/null ||:
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
 
-%files -f %{name}-all.lang
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/dngconverter
-%{_kde4_libdir}/libkipiplugins.so.1*
 %ifnarch s390 s390x
 %{_kde4_libdir}/kde4/kipiplugin_acquireimages.so
 %endif
@@ -185,8 +177,17 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkipiplugins.so.1*
+
 
 %changelog
+* Mon Sep 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-1
+- kipi-plugins-0.7.0
+- -libs pkg, multilib friendly
+- use %%find_lang
+
 * Wed Sep 09 2009 Karsten Hopp <karsten at redhat.com> 0.6.0-2
 - add endian info for s390, s390x
 - kipiplugin_acquireimages.so is not available as kdegraphics is compiled


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	29 Aug 2009 17:50:22 -0000	1.31
+++ sources	28 Sep 2009 14:35:14 -0000	1.32
@@ -1 +1 @@
-105cc1f802db4b082c0ad8ee31262fd5  kipi-plugins-0.6.0.tar.bz2
+564e766f7afac6169ff0cc591667183c  kipi-plugins-0.7.0.tar.bz2


--- kipi-plugins-0.4.0-dt_validation.patch DELETED ---


--- kipi-plugins-0.6.0-s390x.patch DELETED ---