rpms/Terminal/devel .cvsignore, 1.13, 1.14 Terminal.spec, 1.33, 1.34 sources, 1.13, 1.14 Terminal-0.4.2-set-correct-gettext-domain.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30045

Modified Files:
	.cvsignore Terminal.spec sources 
Removed Files:
	Terminal-0.4.2-set-correct-gettext-domain.patch 
Log Message:
* Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.3-1
- Update to 0.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	6 Oct 2009 21:39:19 -0000	1.13
+++ .cvsignore	10 Dec 2009 22:06:08 -0000	1.14
@@ -1 +1 @@
-Terminal-0.4.2.tar.bz2
+Terminal-0.4.3.tar.bz2


Index: Terminal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- Terminal.spec	8 Oct 2009 10:16:29 -0000	1.33
+++ Terminal.spec	10 Dec 2009 22:06:08 -0000	1.34
@@ -1,13 +1,10 @@
 Summary: X Terminal Emulator
 Name: Terminal
-Version: 0.4.2
-Release: 2%{?dist}
+Version: 0.4.3
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
 Source0:  http://archive.xfce.org/src/apps/terminal/0.4/Terminal-%{version}.tar.bz2
-# http://bugzilla.xfce.org/show_bug.cgi?id=5842 was fixed with
-# http://git.xfce.org/apps/terminal/commit/?id=5c955bb0435dca6d7114903d246cf2e4a215cc5e
-Patch0: Terminal-0.4.2-set-correct-gettext-domain.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel >= 0.17.1
@@ -17,6 +14,8 @@ BuildRequires: gettext intltool
 BuildRequires: startup-notification-devel
 BuildRequires: dbus-glib-devel >= 0.22
 BuildRequires: desktop-file-utils
+# required for Terminal-default-apps.xml
+Requires: control-center-filesystem
 
 %description
 Terminal is a lightweight and easy to use terminal emulator application
@@ -25,11 +24,10 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,6 +51,14 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+# workaround for # 447156 - rpm cannot change directory to symlink
+%pretrans
+for dir in C ca da fr gl id ja; do
+#    [ -d "%{_datadir}/doc/Terminal/$dir/images" -a ! -L "%{_datadir}/doc/Terminal/$dir/images" ] && \
+    [ ! -L "%{_datadir}/doc/Terminal/$dir/images" ] && \
+    rm -rf %{_datadir}/doc/Terminal/$dir/images  || :
+done
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -68,10 +74,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/stock/navigation/*.png
 %{_datadir}/pixmaps/terminal.xpm
 %{_datadir}/applications/Terminal.desktop
+%{_datadir}/gnome-control-center/default-apps/Terminal-default-apps.xml
 %{_mandir}/man1/Terminal.1.gz
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Wed Dec 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.3-1
+- Update to 0.4.3
+
 * Thu Oct 08 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
 - Fix locale problems in the UI (bugzilla.xfce.org #5842)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Terminal/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	6 Oct 2009 21:39:19 -0000	1.13
+++ sources	10 Dec 2009 22:06:08 -0000	1.14
@@ -1 +1 @@
-9754afef6b79fa1df9aaf41fb8cc6374  Terminal-0.4.2.tar.bz2
+0ce66b16bcb7ff274d7f93a69993f717  Terminal-0.4.3.tar.bz2


--- Terminal-0.4.2-set-correct-gettext-domain.patch DELETED ---