rpms/libkipi/EL-5 .cvsignore, 1.6, 1.7 libkipi.spec, 1.14, 1.15 sources, 1.6, 1.7

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libkipi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24389

Modified Files:
	.cvsignore libkipi.spec sources 
Log Message:
sync F-9 branch
EL-5 fixes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Dec 2006 12:00:06 -0000	1.6
+++ .cvsignore	22 Sep 2008 16:19:21 -0000	1.7
@@ -1 +1 @@
-libkipi-0.1.5.tar.bz2
+libkipi-0.1.6.tar.bz2


Index: libkipi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/EL-5/libkipi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libkipi.spec	28 Dec 2006 12:00:06 -0000	1.14
+++ libkipi.spec	22 Sep 2008 16:19:21 -0000	1.15
@@ -1,33 +1,44 @@
+
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
 Name:           libkipi
-Version:        0.1.5
-Release:        1%{?dist}
+Version:        0.1.6
+Release:        2%{?dist}
 Summary:        Common plugin infrastructure for KDE image applications
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://extragear.kde.org/apps/kipi
-Source0:        http://dl.sf.net/kipi/libkipi-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/kipi/libkipi-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel >= 6:3.0
-BuildRequires:  gettext, libacl-devel
+BuildRequires:  gettext
+BuildRequires:  %{kdelibs3}-devel
 
 %description
 Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin
-structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share
+structure for Digikam, Kphotoalbum, Showimg and Gwenview. Its aim is to share
 image plugins among graphic applications.
 
 %package        devel
-Summary:        Common plugin infrastructure for KDE image applications
+Summary:        Development files for %{name} 
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdelibs-devel
+Requires:       %{kdelibs3}-devel
 Requires:       pkgconfig
 
 %description    devel
-Kipi (KDE Image Plugin Interface) is an effort to develop a common plugin
-structure for Digikam, KimDaBa, Showimg and Gwenview. Its aim is to share
-image plugins among graphic applications.
+%{summary}.
 This package contains the files needed to build applications with Kipi
 support
 
@@ -38,9 +49,13 @@
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-# work around an improper ${kdelibsuff}
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --disable-debug --enable-final
+
+%configure \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
+
 make %{?_smp_mflags}
 
 
@@ -50,7 +65,11 @@
 
 %find_lang %{name}
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if 0%{?nuke_icons}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
 
 
 %clean
@@ -59,31 +78,52 @@
 
 %post 
 /sbin/ldconfig
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%endif
 
 %postun
 /sbin/ldconfig
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%endif
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/*.so.*
-%{_datadir}/apps/kipi
-%{_datadir}/icons/hicolor/*/apps/kipi.png
+%{_libdir}/libkipi.so.0*
+%{_datadir}/apps/kipi/
+%if ! 0%{?nuke_icons}
+%{_datadir}/icons/hicolor/*/*/*
+%endif
 %{_datadir}/servicetypes/*.desktop
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
+%{_libdir}/libkipi.so
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/libkipi
+%{_includedir}/libkipi/
 
 
 %changelog
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
+- fix conflicts with kdegraphics (f9+, #452392)
+
+* Fri May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-1
+- libkipi-0.1.6
+
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-4
+- cleanup, fixup for rawhide (#433965)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.5-3
+- Autorebuild for GCC 4.3
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.1.5-2
+- fix license tag
+
 * Fri Dec 08 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.1.5-1
 - version 0.1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Dec 2006 12:00:06 -0000	1.6
+++ sources	22 Sep 2008 16:19:21 -0000	1.7
@@ -1 +1 @@
-aef790871583444cd81bd9dea9c3fd0b  libkipi-0.1.5.tar.bz2
+6fd010aa8eab7039143f69543e806c65  libkipi-0.1.6.tar.bz2