[mate-menus] Update to 1.7.0
Dan Mashal
vicodan at fedoraproject.org
Fri Dec 6 22:15:17 UTC 2013
commit f0e17123f9480e9b51cbc4fcda09e1ba35072c1e
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Fri Dec 6 14:15:10 2013 -0800
Update to 1.7.0
.gitignore | 1 +
mate-menus.spec | 13 +++++--------
sources | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f22dd8..b9f9c19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/mate-menus-1.4.0.tar.xz
/mate-menus-1.5.0.tar.xz
/mate-menus-1.6.0.tar.xz
+/mate-menus-1.7.0.tar.xz
diff --git a/mate-menus.spec b/mate-menus.spec
index 31dffb5..ff5bf84 100644
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@ -1,16 +1,13 @@
Name: mate-menus
-Version: 1.6.0
-Release: 5%{?dist}
+Version: 1.7.0
+Release: 1%{?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: chrpath
BuildRequires: gobject-introspection-devel
BuildRequires: mate-common
BuildRequires: python-devel
@@ -49,13 +46,11 @@ Development files for mate-menus
%prep
%setup -q
-%patch0 -p1 -b .preferences
# fedora specific
# fix for usage of multimedia-menus package
sed -i -e '/<!-- End Other -->/ a\ <MergeFile>applications-merged/multimedia-categories.menu</MergeFile>' layout/mate-applications.menu
-NOCONFIGURE=1 ./autogen.sh
%build
@@ -72,6 +67,8 @@ 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 {} ';'
+chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/matemenu.so
+
%find_lang %{name}
%post libs -p /sbin/ldconfig
diff --git a/sources b/sources
index 4959023..64198ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98937d51fb1e577b21a2b8552697bee8 mate-menus-1.6.0.tar.xz
+5b7f53a7fdaac1e192ac53fff43d38f8 mate-menus-1.7.0.tar.xz
More information about the scm-commits
mailing list