[mate-control-center] Update to 1.7.0

Dan Mashal vicodan at fedoraproject.org
Mon Feb 10 01:21:12 UTC 2014


commit 793b0ff11154c90948f75aa838401325ac962f2e
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Feb 9 17:21:45 2014 -0800

    Update to 1.7.0

 .gitignore               |    1 +
 mate-control-center.spec |   34 +++++++++++++++++++++++++---------
 sources                  |    2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c469be5..b40e5d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /mate-control-center-1.6.1.tar.xz
 /mate-control-center-1.7.0.git922d0e0.tar.xz
 /mate-control-center-1.7.0-git20131113-922d0e0.tar.xz
+/mate-control-center-1.7.0.tar.xz
diff --git a/mate-control-center.spec b/mate-control-center.spec
index ec2ea69..79d36ba 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,5 +1,5 @@
 # Conditional for release and snapshot builds. Uncomment for release-builds.
-# %%global rel_build 1
+%global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
 %global branch 1.7
@@ -14,10 +14,10 @@
 
 Name:          mate-control-center
 Version:       %{branch}.0
-Release:       0.2%{?git_rel}%{?dist}
-Summary:    MATE Desktop control-center
-License:        LGPLv2+ and GPLv2+
-URL:              http://mate-desktop.org
+Release:       1%{?dist}
+Summary:       MATE Desktop control-center
+License:       LGPLv2+ and GPLv2+
+URL:           http://mate-desktop.org
 
 # for downloading the tarball use 'spectool -g -R mate-control-center.spec'
 # Source for release-builds.
@@ -25,6 +25,7 @@ URL:              http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
+BuildRequires: chrpath
 BuildRequires: dconf-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -79,7 +80,6 @@ Development files for mate-control-center
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
 %build
-NOCONFIGURE=1 ./autogen.sh
 %configure                                           \
            --disable-static                      \
            --disable-schemas-compile \
@@ -98,9 +98,25 @@ make %{?_smp_mflags} V=1
 find %{buildroot} -name '*.la' -exec rm -rf {} ';'
 find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
-desktop-file-install                                            \
-    --delete-original                                         \
-    --dir=%{buildroot}%{_datadir}/applications \
+# https://github.com/mate-desktop/mate-control-center/issues/84
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/libmarco.so
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-appearance-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-keyboard-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-at-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-font-viewer
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-control-center
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-keybinding-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-default-applications-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-window-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-thumbnail-font
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-about-me
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-mouse-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-display-properties
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/mate-network-properties
+
+desktop-file-install                                \
+    --delete-original                               \
+    --dir=%{buildroot}%{_datadir}/applications      \
 %{buildroot}%{_datadir}/applications/*.desktop
 
 # delete mime cache
diff --git a/sources b/sources
index 54eb4aa..5a2c531 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fc9aeaf3dcc9547d16a6b4c295b6ffa  mate-control-center-1.7.0-git20131113-922d0e0.tar.xz
+755730b196479b8b88978562bff13d71  mate-control-center-1.7.0.tar.xz


More information about the scm-commits mailing list