[mate-desktop] Update to 1.6.0 stable release
Dan Mashal
vicodan at fedoraproject.org
Wed Apr 3 11:05:17 UTC 2013
commit 010e822453c52db5014366173d9abcad5b92fc57
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Wed Apr 3 04:04:58 2013 -0700
Update to 1.6.0 stable release
.gitignore | 1 +
mate-desktop.spec | 92 ++++++++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 55 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aef3cc9..183f75b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/mate-desktop-1.5.6.tar.xz
/mate-desktop-1.5.7.tar.xz
/mate-desktop-1.5.8.tar.xz
+/mate-desktop-1.6.0.tar.xz
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 56e6400..a6deae4 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,24 +1,37 @@
-Summary: Shared code for mate-panel, mate-session, mate-file-manager, etc
-Name: mate-desktop
-Version: 1.5.8
-Release: 1%{?dist}
-URL: http://mate-desktop.org
-Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-Source1: user-dirs-update-mate.desktop
-
-License: GPLv2+ and LGPLv2+ and MIT
-
-BuildRequires: desktop-file-utils
+Summary: Shared code for mate-panel, mate-session, mate-file-manager, etc
+Name: mate-desktop
+Version: 1.6.0
+Release: 1%{?dist}
+URL: http://mate-desktop.org
+Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+License: GPLv2+ and LGPLv2+ and MIT
+
+BuildRequires: desktop-file-utils
BuildRequires: gsettings-desktop-schemas-devel
+BuildRequires: gtk2-devel
+BuildRequires: gtk-doc
BuildRequires: mate-common
BuildRequires: mate-doc-utils
BuildRequires: startup-notification-devel
BuildRequires: unique-devel
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: redhat-menus
-Requires: pygtk2
-Requires: xdg-user-dirs-gtk
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: redhat-menus
+Requires: pygtk2
+Requires: xdg-user-dirs-gtk
+
+Obsoletes: libmate
+Obsoletes: libmatecanvas
+Obsoletes: libmatecomponent
+Obsoletes: libmatecomponentui
+Obsoletes: libmatenotify
+Obsoletes: libmateui
+Obsoletes: mate-conf-editor
+Obsoletes: mate-conf-gtk
+Obsoletes: mate-mime-data
+Obsoletes: mate-vfs
+Requires: libnotify
+Requires: mate-panel
%description
The mate-desktop package contains an internal library
@@ -27,19 +40,17 @@ desktop, and also some data files and other shared components of the
MATE user environment.
%package libs
-Summary: Shared libraries for libmate-desktop
-License: LGPLv2+
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary: Shared libraries for libmate-desktop
+License: LGPLv2+
+Requires: %{name} = %{version}-%{release}
%description libs
Shared libraries for libmate-desktop
%package devel
-Summary: Libraries and headers for libmate-desktop
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Summary: Libraries and headers for libmate-desktop
+License: LGPLv2+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Libraries and header files for the MATE-internal private library
@@ -52,14 +63,15 @@ NOCONFIGURE=1 ./autogen.sh
%build
%configure \
- --enable-gnucat \
- --disable-scrollkeeper \
- --disable-static \
- --disable-schemas-compile \
- --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids" \
- --enable-unique \
- --enable-gtk-doc \
- --with-omf-dir=%{_datadir}/omf/mate-desktop
+ --disable-scrollkeeper \
+ --disable-schemas-compile \
+ --with-gtk=2.0 \
+ --with-x \
+ --disable-static \
+ --enable-unique \
+ --enable-gtk-doc \
+ --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids" \
+ --with-omf-dir=%{_datadir}/omf/mate-desktop
make %{?_smp_mflags} V=1
@@ -70,12 +82,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
-desktop-file-install \
- --delete-original \
- --dir=%{buildroot}%{_datadir}/applications \
+desktop-file-install \
+ --delete-original \
+ --dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/mate-about.desktop
-install -D -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop
+#install -D -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop
%find_lang %{name}
@@ -95,27 +107,29 @@ fi
%files -f %{name}.lang
%doc AUTHORS COPYING COPYING.LIB NEWS README
%{_bindir}/mate-about
-%{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop
+#%{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop
%{_datadir}/applications/mate-about.desktop
%{_datadir}/mate/help/*/*/*.xml
%{_datadir}/omf/mate-desktop/
%{_datadir}/mate-about/
%{_datadir}/glib-2.0/schemas/org.mate.*.gschema.xml
%{_mandir}/man1/mate-about.1*
-%{_datadir}/pixmaps/gnu-cat*
%{_datadir}/MateConf/gsettings/mate-desktop.convert
%files libs
%{_libdir}/libmate-desktop-2.so.*
%files devel
-%doc %{_datadir}/gtk-doc/html/mate-desktop/
+%{_datadir}/gtk-doc/html/mate-desktop
%{_libdir}/libmate-desktop-2.so
%{_libdir}/pkgconfig/mate-desktop-2.0.pc
-%{_includedir}/mate-desktop-2.0/
+%{_includedir}/mate-desktop-2.0
%changelog
+* Tue Apr 02 2013 - Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.0-1
+- Update to 1.6.0 release.
+
* Mon Mar 25 2013 - Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.8-1
-Update to latest upstream release
diff --git a/sources b/sources
index 6d18a67..f411763 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3b13f8d9125578c98cdf4c8ef940bfb mate-desktop-1.5.8.tar.xz
+425e5bf587372cc05dcb4538b8c3825d mate-desktop-1.6.0.tar.xz
More information about the scm-commits
mailing list