[mate-menus] update spec file and bump version

Wolfgang Ulbrich raveit65 at fedoraproject.org
Tue Jun 4 15:57:34 UTC 2013


commit 0756e8c2069a6c8724320a7a8384fcafe8b1da7e
Author: raveit <chat-to-me at raveit.de>
Date:   Tue Jun 4 17:57:04 2013 +0200

    update spec file and bump version

 mate-menus.spec |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/mate-menus.spec b/mate-menus.spec
index 55f4488..f63c17d 100644
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@ -1,15 +1,22 @@
 Name:           mate-menus
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Displays menus for MATE Desktop
 License:        GPLv2+ and LGPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+Source1: 		mate-preferences-categories.menu
+
+# patch in upstream
+# https://github.com/mate-desktop/mate-menus/commit/e5734e2b6017c36fca8ab2403ed6cabfa7ef0d23
+Patch0:         mate-menus_preferences-menu.patch
 
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  mate-common
 BuildRequires:  python-devel
 
+Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
+
 # we don't want to provide private python extension libs
 %{?filter_setup:
 %filter_provides_in %{python_sitearch}/.*\.so$
@@ -35,6 +42,7 @@ Development files for mate-menus
 
 %prep
 %setup -q
+%patch0 -p1 -b .preferences
 NOCONFIGURE=1 ./autogen.sh
 
 
@@ -49,6 +57,7 @@ make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=%{buildroot}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/menus
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %find_lang %{name}
@@ -58,8 +67,9 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
-%{_sysconfdir}/xdg/menus/mate-applications.menu
-%{_sysconfdir}/xdg/menus/mate-settings.menu
+%config %{_sysconfdir}/xdg/menus/mate-applications.menu
+%config %{_sysconfdir}/xdg/menus/mate-settings.menu
+%config %{_sysconfdir}/xdg/menus/mate-preferences-categories.menu
 %{_datadir}/mate-menus
 %{_datadir}/mate/desktop-directories
 
@@ -77,6 +87,11 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Apr 12 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-2
+- add preferences-category-menu
+- add requires mate-menus-libs
+- mark *.menu files as %%config in %%{_sysconfdir} dir
+
 * Wed Apr 03 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.0-1
 - Update to latest 1.6.0 stable release.
 


More information about the scm-commits mailing list