[mate-window-manager] 1.4.0-4

[Rex Dieter]

commit 51eeb8098fc333f87fac0a53d1c355434754bc66
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 07:34:43 2012 -0500

    1.4.0-4
    
    - main pkg Requires: %name-libs
    - drop needless icon scriptlets
    - s|MATE|X-MATE| .desktop Categories on < f18 only
    - License: GPLv2+

 mate-window-manager.spec |   50 ++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index 50991af..ed4baab 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,12 +1,14 @@
 Name:		mate-window-manager
 Version:	1.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	MATE Desktop window manager
-License:	GPLv2+ and LGPLv2+
+License:	GPLv2+
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
 BuildRequires:	desktop-file-utils gtk2-devel libcanberra-devel libsoup-devel mate-common mate-doc-utils mate-conf-devel mate-corba-devel mate-dialogs pygobject2-codegen python-gudev pygtk2-devel
+
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires(pre):	mate-conf
 Requires(post):	mate-conf
 Requires(preun):	mate-conf
@@ -16,14 +18,13 @@ MATE Desktop window manager
 
 %package libs
 Summary: Shared libraries for mate-window-manager
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description libs
 Shared libraries for mate-window-manager
 
 %package devel
 Summary: Development files for mate-window-manager
-Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -40,40 +41,36 @@ make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=%{buildroot}
+
 %find_lang %{name} --all-name
-find %{buildroot} -name '*.la' -exec rm -rf {} ';'
-find %{buildroot} -name '*.a' -exec rm -rf {} ';'
+
+find %{buildroot} -name '*.la' -exec rm -vf {} ';'
+
 desktop-file-install									\
 	--remove-category="MATE"							\
 	--add-category="X-Mate"								\
+%if 0%{?fedora} < 18
 	--remove-only-show-in="MATE"							\
 	--add-only-show-in="X-MATE"							\
+%endif
 	--delete-original								\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/marco.desktop
 
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
+
+
 %pre
 %mateconf_schema_prepare marco
 
 %post
-/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null || :
 %mateconf_schema_upgrade marco
 
 %postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/mate &>/dev/null
-    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/mate &>/dev/null || :
-fi
 %mateconf_schema_remove marco
 
-
-%posttrans
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/mate &>/dev/null || :
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %{_mandir}/man1/*
@@ -84,16 +81,17 @@ fi
 %{_bindir}/marco-window-demo
 %{_datadir}/applications/marco.desktop
 %{_datadir}/themes/*
-%{_datadir}/marco/icons/marco-window-demo.png
+%{_datadir}/marco/
 %{_datadir}/mate-control-center/keybindings/50-marco-desktop-key.xml
 %{_datadir}/mate-control-center/keybindings/50-marco-key.xml
 %{_datadir}/mate/help/creating-marco-themes/C/creating-marco-themes.xml
 %{_datadir}/mate/wm-properties/
 
-%files libs
-%{_libdir}/libmarco-private.so.0
-%{_libdir}/libmarco-private.so.0.0.0
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
+%files libs
+%{_libdir}/libmarco-private.so.0*
 
 %files devel
 %{_includedir}/marco-1/
@@ -102,6 +100,12 @@ fi
 
 
 %changelog
+* Mon Aug 27 2012 Rex Dieter <rdieter at fedoraproject.org>  1.4.0-4
+- main pkg Requires: %%name-libs
+- drop needless icon scriptlets
+- s|MATE|X-MATE| .desktop Categories on < f18 only
+- License: GPLv2+
+
 * Sun Aug 26 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-3
 - Own theme directories that are being installed, switch from po_package to namefor lang files, bump release version