rpms/libkdcraw/EL-5 .cvsignore, 1.4, 1.5 libkdcraw.spec, 1.3, 1.4 sources, 1.4, 1.5

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
sync w/devel, add el5 hack/workaround



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Dec 2007 20:27:44 -0000	1.4
+++ .cvsignore	21 Sep 2008 21:26:53 -0000	1.5
@@ -1 +1 @@
-libkdcraw-0.1.2.tar.bz2
+libkdcraw-0.1.4.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/libkdcraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libkdcraw.spec	15 Dec 2007 20:27:44 -0000	1.3
+++ libkdcraw.spec	21 Sep 2008 21:26:53 -0000	1.4
@@ -1,6 +1,12 @@
+
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
 Name:		libkdcraw
-Version:	0.1.2
-Release:	1%{?dist}
+Version:	0.1.4
+Release:	2%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -9,7 +15,14 @@
 Source0:	http://downloads.sourceforge.net/kipi/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	kdelibs-devel lcms-devel gettext pkgconfig
+%if 0%{?fedora} > 6
+BuildRequires:	kdelibs3-devel
+%else
+BuildRequires:	kdelibs-devel libutempter-devel
+%endif
+BuildRequires:	gettext
+BuildRequires: 	lcms-devel
+BuildRequires:	pkgconfig
 
 %description
 libkdcraw is a C++ interface around dcraw binary program used to decode RAW
@@ -40,8 +53,10 @@
 	--enable-final \
 	--enable-new-ldflags \
 	--disable-warnings
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -49,32 +64,42 @@
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
+%if 0%{?nuke_icons}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
+
 
 %post
 /sbin/ldconfig
-
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%endif
 
 %postun
 /sbin/ldconfig
-
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %name.lang
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw2/
-%{_datadir}/icons/hicolor/*/apps/kdcraw.png
+%{_libdir}/libkdcraw3/
+%if ! 0%{?nuke_icons}
+%{_datadir}/icons/hicolor/*/*/*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -82,11 +107,32 @@
 %{_libdir}/pkgconfig/libkdcraw.pc
 %{_libdir}/libkdcraw.so
 
+
 %changelog
-* Sat Dec 15 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-1
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
+- fix conflicts with kdegraphics (f9+, #452392)
+
+* Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-1
+- libkdcraw-0.1.4
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.3-2
+- Autorebuild for GCC 4.3
+
+* Fri Dec 28 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.3-1
+- Update to 0.1.3
+
+* Sun Dec 09 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-2
+- BR: kdelibs3-devel
+
+* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.2-1
 - Update to 0.1.2
+
+* Fri Aug 31 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.1-3
 - Fix license tag
 
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.1.1-2
+- Rebuild for selinux ppc32 issue.
+
 * Tue Jun 19 2007 Marcin Garski <mgarski[AT]post.pl> 0.1.1-1
 - Update to libkdcraw-0.1.1 (#244872)
 - Spec fixes by Rex Dieter


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2007 20:27:44 -0000	1.4
+++ sources	21 Sep 2008 21:26:53 -0000	1.5
@@ -1 +1 @@
-38ed88e8b7387526113f150c349c8eb4  libkdcraw-0.1.2.tar.bz2
+4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2