rpms/libkdcraw/devel libkdcraw.spec,1.9,1.10
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Jun 24 18:48:14 UTC 2008
- Previous message (by thread): rpms/pvm/F-8 pvm-arch.patch, NONE, 1.1 pvm.spec, 1.38, 1.39 sources, 1.5, 1.6 pvmd.init, 1.2, NONE
- Next message (by thread): rpms/sugar-datastore/F-9 sugar-datastore.spec,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/libkdcraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2949
Modified Files:
libkdcraw.spec
Log Message:
* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
- fix conflicts with kdegraphics (f9+, #452392)
Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/libkdcraw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libkdcraw.spec 14 Mar 2008 17:51:35 -0000 1.9
+++ libkdcraw.spec 24 Jun 2008 18:47:24 -0000 1.10
@@ -1,7 +1,12 @@
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
Name: libkdcraw
Version: 0.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A library for decoding RAW picture files
Group: Applications/Multimedia
@@ -41,8 +46,10 @@
--enable-final \
--enable-new-ldflags \
--disable-warnings
+
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -50,32 +57,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}/libkdcraw3/
+%if ! 0%{?nuke_icons}
%{_datadir}/icons/hicolor/*/*/*
+%endif
%files devel
%defattr(-,root,root,-)
@@ -83,7 +100,11 @@
%{_libdir}/pkgconfig/libkdcraw.pc
%{_libdir}/libkdcraw.so
+
%changelog
+* 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
- Previous message (by thread): rpms/pvm/F-8 pvm-arch.patch, NONE, 1.1 pvm.spec, 1.38, 1.39 sources, 1.5, 1.6 pvmd.init, 1.2, NONE
- Next message (by thread): rpms/sugar-datastore/F-9 sugar-datastore.spec,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list