[mate-window-manager] update to mate-window-manager 1.4.1 and cleanup spec file

Dan Mashal vicodan at fedoraproject.org
Mon Sep 3 07:31:26 UTC 2012


commit 6957301bd7265e8ed1092081aa1368fd66003ab2
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 3 00:30:55 2012 -0700

    update to mate-window-manager 1.4.1 and cleanup spec file

 .gitignore               |    1 +
 mate-window-manager.spec |   52 +++++++++++++++++++++++++++------------------
 sources                  |    2 +-
 3 files changed, 33 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba70b51..b940c62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mate-window-manager-1.4.0.tar.xz
+/mate-window-manager-1.4.1.tar.xz
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index 9b05415..d7d5801 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,8 +1,8 @@
 Name:		mate-window-manager
-Version:	1.4.0
-Release:	5%{?dist}
+Version:	1.4.1
+Release:	1%{?dist}
 Summary:	MATE Desktop window manager
-License:	GPLv2+
+License:	LGPLv2+ GPLv2+
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
@@ -13,15 +13,11 @@ Requires(pre):	mate-conf
 Requires(post):	mate-conf
 Requires(preun):	mate-conf
 
+Obsoletes: mate-window-manager < 1.4.1
+
 %description
 MATE Desktop window manager
 
-%package libs
-Summary: Shared libraries for mate-window-manager
-Requires:	%{name} = %{version}-%{release}
-
-%description libs
-Shared libraries for mate-window-manager
 
 %package devel
 Summary: Development files for mate-window-manager
@@ -45,6 +41,7 @@ make install DESTDIR=%{buildroot}
 
 %find_lang %{name} --all-name
 
+find %{buildroot} -name '*.a' -exec rm -vf {} ';'
 find %{buildroot} -name '*.la' -exec rm -vf {} ';'
 
 desktop-file-install									\
@@ -57,11 +54,11 @@ desktop-file-install									\
 	--delete-original								\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/marco.desktop
-
+#%{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
-
+#desktop-file-validate %{buildroot}%{_datadir}/mate/wm-properties/marco-wm.desktop
 
 %pre
 %mateconf_schema_prepare marco
@@ -81,16 +78,26 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
 %{_bindir}/marco-theme-viewer
 %{_bindir}/marco-window-demo
 %{_datadir}/applications/marco.desktop
-%{_datadir}/themes/*
-%{_datadir}/marco/
-# until better owners come along, just snarf it all here -- rex
-%{_datadir}/mate-control-center/
-%{_datadir}/mate/
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
+%{_datadir}/themes/ClearlooksRe/metacity-1/*.xml
+%{_datadir}/themes/Dopple-Left/metacity-1/*.xml
+%{_datadir}/themes/Dopple/metacity-1/*.xml
+%{_datadir}/themes/DustBlue/metacity-1/*.png
+%{_datadir}/themes/DustBlue/metacity-1/*.xml
+%{_datadir}/themes/Spidey-Left/metacity-1/*.xml
+%{_datadir}/themes/Spidey/metacity-1/*.xml
+%{_datadir}/themes/Splint-Left/metacity-1/*.xml
+%{_datadir}/themes/Splint/metacity-1/*.xml
+%{_datadir}/themes/WinMe/metacity-1/*.png
+%{_datadir}/themes/WinMe/metacity-1/*.xml
+%{_datadir}/themes/eOS/metacity-1/*.png
+%{_datadir}/themes/eOS/metacity-1/*.xml
+
+
+%{_datadir}/marco/icons/marco-window-demo.png
+%{_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/marco-wm.desktop
 %{_libdir}/libmarco-private.so.0*
 
 %files devel
@@ -100,6 +107,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
 
 
 %changelog
+* Sun Sep 02 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.1-1
+- Upgrade to new upstream version.
+
 * Mon Aug 27 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4.0-5
 - drop unneeded python-related build deps
 - %%configure --disable-schemas-install
diff --git a/sources b/sources
index a03b41b..3aa8536 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b111a2ea36b6fea4603d63e4dc252092  mate-window-manager-1.4.0.tar.xz
+a6d5807a1ad7e014e6a54e4fcfc16b30  mate-window-manager-1.4.1.tar.xz


More information about the scm-commits mailing list