[mate-terminal] update to latest upstream relase

Dan Mashal vicodan at fedoraproject.org
Sun Jan 20 08:38:11 UTC 2013


commit 687a8ea5d93c3759d16aaba6f62c00a4fb348ee4
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Jan 20 02:36:20 2013 -0600

    update to latest upstream relase

 mate-terminal.spec |  100 ++++++++++++++++++++++-----------------------------
 1 files changed, 43 insertions(+), 57 deletions(-)
---
diff --git a/mate-terminal.spec b/mate-terminal.spec
index 6cb2324..7cb5986 100644
--- a/mate-terminal.spec
+++ b/mate-terminal.spec
@@ -1,31 +1,21 @@
-Summary: Terminal emulator for MATE
-Name: mate-terminal
-Version: 1.4.0
-Release: 4%{?dist}
-License: GPLv3+
-Group: User Interface/Desktops
-URL: http://mate-desktop.org
-Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-
-# mateconftool-2
-Requires(pre):   mate-conf
-Requires(post):  mate-conf
-Requires(preun): mate-conf
-
+Summary:        Terminal emulator for MATE
+Name:           mate-terminal
+Version:        1.5.0
+Release:        1%{?dist}
+License:        GPLv3+
+URL:            http://mate-desktop.org
+Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+
+BuildRequires: dconf-devel
+BuildRequires: desktop-file-utils
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-BuildRequires: mate-conf-devel
-BuildRequires: libglade2-devel
-BuildRequires: libmateui-devel
-BuildRequires: vte-devel
-BuildRequires: desktop-file-utils
-BuildRequires: rarian-compat
+BuildRequires: libSM-devel
 BuildRequires: mate-doc-utils
 BuildRequires: mate-common
-BuildRequires: libSM-devel
-# https://bugzilla.redhat.com/show_bug.cgi?id=869744
-Requires: libmate
+BuildRequires: rarian-compat
+BuildRequires: rarian-devel
+BuildRequires: vte-devel 
 
 %description
 Mate-terminal is a terminal emulator for MATE. It supports translucent
@@ -37,50 +27,48 @@ clickable URLs.
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure --with-gtk=2.0 \
-           --disable-scrollkeeper \
-           --disable-schemas-install
+%configure --disable-static                \
+           --with-gtk=2.0                  \
+           --disable-scrollkeeper          \
+           --disable-schemas-compile       \
+           --with-gnu-ld                   
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-sed -i -e "s/Icon=mate-terminal.png/Icon=mate-terminal/" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/mate-terminal.desktop
-
-desktop-file-install --vendor "" --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications    \
-  --remove-category=MATE                           \
-  --add-category=X-Mate                            \
-  --add-category=System                            \
-  $RPM_BUILD_ROOT%{_datadir}/applications/mate-terminal.desktop
-
-%find_lang mate-terminal
+make DESTDIR=%{buildroot} install
+%find_lang %{name}
 
-%post
-%mateconf_schema_upgrade mate-terminal
+desktop-file-install							\
+	--remove-category="MATE"					\
+	--add-category="X-Mate"						\
+	--delete-original						\
+	--dir=%{buildroot}%{_datadir}/applications			\
+%{buildroot}%{_datadir}/applications/mate-terminal.desktop
 
-%pre
-%mateconf_schema_prepare mate-terminal
+%postun
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
-%preun
-%mateconf_schema_remove mate-terminal
+%posttrans
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-
-%files -f mate-terminal.lang
+%files -f %{name}.lang
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/mate-terminal
-%{_datadir}/mate-terminal/
-%{_datadir}/mate/help/mate-terminal/
-%{_datadir}/omf/mate-terminal/
+%{_datadir}/mate-terminal
+%{_datadir}/mate/help/mate-terminal
+%{_datadir}/omf/mate-terminal
 %{_datadir}/applications/mate-terminal.desktop
-%{_sysconfdir}/mateconf/schemas/mate-terminal.schemas
+%{_datadir}/glib-2.0/schemas/org.mate.terminal.gschema.xml
 
 %changelog
+* Sat Jan 19 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.0-1
+- Update to latest upstream release
+- Special thanks to Shawn Sterling for his help
+
 * Wed Oct 24 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-4
 - Add requires libmate
 
@@ -92,5 +80,3 @@ desktop-file-install --vendor "" --delete-original \
 
 * Sun Oct 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-1
 - initial build
-
-


More information about the scm-commits mailing list