packages: meld/meld.spec - do not use %{_iconsdir}/hicolor/* in filelist - ...

glen glen at pld-linux.org
Tue Dec 21 17:58:15 CET 2010


Author: glen                         Date: Tue Dec 21 16:58:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not use %{_iconsdir}/hicolor/* in filelist - the dirs belong to hicolor-icon-theme package

---- Files affected:
packages/meld:
   meld.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: packages/meld/meld.spec
diff -u packages/meld/meld.spec:1.63 packages/meld/meld.spec:1.64
--- packages/meld/meld.spec:1.63	Sat Oct 16 16:42:07 2010
+++ packages/meld/meld.spec	Tue Dec 21 17:58:10 2010
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:		meld
 Version:	1.4.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Text
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/1.4/%{name}-%{version}.tar.bz2
@@ -82,6 +82,8 @@
 
 %find_lang %{name} --with-gnome --with-omf
 
+rm $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/meld.svg
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -98,13 +100,12 @@
 %doc AUTHORS
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{py_sitedir}/%{name}
-%dir %{py_sitedir}/%{name}/%{name}
 %{py_sitedir}/%{name}/*.py[co]
-%{py_sitedir}/%{name}/%{name}/*
-%{_iconsdir}/hicolor/*
+%{py_sitedir}/%{name}/%{name}
+%{_iconsdir}/hicolor/*/apps/%{name}.png
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -112,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2010/12/21 16:58:10  glen
+- do not use %{_iconsdir}/hicolor/* in filelist - the dirs belong to hicolor-icon-theme package
+
 Revision 1.63  2010/10/16 14:42:07  qwiat
 - updated to 1.4.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/meld/meld.spec?r1=1.63&r2=1.64&f=u



More information about the pld-cvs-commit mailing list