rpms/libkdcraw/F-8 .cvsignore, 1.5, 1.6 libkdcraw.spec, 1.6, 1.7 sources, 1.5, 1.6

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17544

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
- update %description
- nuke_icons -> nuke_kdegraphics4_conflicts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Dec 2007 13:10:55 -0000	1.5
+++ .cvsignore	11 Nov 2008 15:17:12 -0000	1.6
@@ -1 +1 @@
-libkdcraw-0.1.3.tar.bz2
+libkdcraw-0.1.6.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-8/libkdcraw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libkdcraw.spec	29 Dec 2007 13:10:55 -0000	1.6
+++ libkdcraw.spec	11 Nov 2008 15:17:13 -0000	1.7
@@ -1,6 +1,19 @@
+
+%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_kdegraphics4_conflicts 1
+%endif
+
 Name:		libkdcraw
-Version:	0.1.3
-Release:	1%{?dist}
+Version:	0.1.6
+Release:	2%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -9,11 +22,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
+BuildRequires:	%{kdelibs3}-devel
+BuildRequires:	gettext
+BuildRequires: 	lcms-devel
+BuildRequires:	pkgconfig
 
 %description
-libkdcraw is a C++ interface around dcraw binary program used to decode RAW
-picture files. The library documentation is available on header files.
+Libkdcraw is a C++ interface around LibRaw library used to decode RAW
+picture files.
 
 This library is used by kipi-plugins, digiKam and others kipi host programs.
 
@@ -40,8 +56,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 +67,41 @@
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
+%if 0%{?nuke_kdegraphics4_conflicts}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
+
 
 %post
 /sbin/ldconfig
-
+%if ! 0%{?nuke_kdegraphics4_conflicts}
 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_kdegraphics4_conflicts}
 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}/libkdcraw.so.4*
+%if ! 0%{?nuke_kdegraphics4_conflicts}
+%{_datadir}/icons/hicolor/*/*/*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -82,10 +109,30 @@
 %{_libdir}/pkgconfig/libkdcraw.pc
 %{_libdir}/libkdcraw.so
 
+
 %changelog
+* Tue Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
+- update %%description
+- nuke_icons -> nuke_kdegraphics4_conflicts
+
+* Sun Oct 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-1
+- libkdcraw-0.1.6
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Dec 2007 13:10:55 -0000	1.5
+++ sources	11 Nov 2008 15:17:13 -0000	1.6
@@ -1 +1 @@
-dc4772804c17d7eff4f913048b8e1c3c  libkdcraw-0.1.3.tar.bz2
+04a5aff7a76c2f5b68f9ebb902e90a9d  libkdcraw-0.1.6.tar.bz2