rpms/gtranslator/EL-4 gtranslator-1.1.7-desktop.patch, NONE, 1.1 gtranslator-1.1.7-scrollkeeper-rarian.patch, NONE, 1.1 gtranslator.spec, 1.3, 1.4 sources, 1.2, 1.3

Tue Dec 11 10:58:05 UTC 2007

Author: sindrepb

Update of /cvs/pkgs/rpms/gtranslator/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11039

Modified Files:
	gtranslator.spec sources 
Added Files:
	gtranslator-1.1.7-desktop.patch 
	gtranslator-1.1.7-scrollkeeper-rarian.patch 
Log Message:
add files to branch

gtranslator-1.1.7-desktop.patch:

--- NEW FILE gtranslator-1.1.7-desktop.patch ---
--- gtranslator-1.1.7/data/desktop/gtranslator.desktop.in.orig	2007-02-11 17:35:13.000000000 +0100
+++ gtranslator-1.1.7/data/desktop/gtranslator.desktop.in	2007-02-11 17:59:42.000000000 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=gtranslator
-_Comment=The GNOME translation program
+Name=gtranslator
+Comment=The GNOME translation program
 Icon=gtranslator.png
 Exec=gtranslator
 Terminal=false

gtranslator-1.1.7-scrollkeeper-rarian.patch:

--- NEW FILE gtranslator-1.1.7-scrollkeeper-rarian.patch ---
diff -up gtranslator-1.1.7/configure.orig gtranslator-1.1.7/configure
--- gtranslator-1.1.7/configure.orig	2007-10-23 14:20:06.000000000 +0200
+++ gtranslator-1.1.7/configure	2007-10-23 14:20:32.000000000 +0200
@@ -7127,7 +7127,7 @@ fi
 if test "z$sc_present" = "zyes" ; then
 	{ echo "$as_me:$LINENO: checking for scrollkeeper" >&5
 echo $ECHO_N "checking for scrollkeeper... $ECHO_C" >&6; }
-	_VERSION=`scrollkeeper-config --version|sed -e 's/\.//g'`
+	_VERSION=`scrollkeeper-config --version|sed -e 's/\.//g' | cut -d ' ' -f1`
 	if test $_VERSION -ge 0 -o $_VERSION -ge 02; then
 		{ echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }


Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/EL-4/gtranslator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtranslator.spec	10 Dec 2004 22:03:03 -0000	1.3
+++ gtranslator.spec	11 Dec 2007 10:57:29 -0000	1.4
@@ -1,21 +1,26 @@
-Name:		gtranslator
-Version:	1.1.5
-Release:	1
-Epoch:		0
-Summary:	A gettext po file editor for GNOME
-
-Group:		Development/Tools
-License:	GPL
-URL:		http://www.gtranslator.org/
-Source0:	http://dl.sf.net/gtranslator/gtranslator-1.1.5.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           gtranslator
+Version:        1.1.7
+Release:        7%{?dist}
+
+Summary:        Gettext po file editor for GNOME
+
+Group:          Development/Tools
+License:        GPL
+URL:            http://gtranslator.sourceforge.net
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.1/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-%{version}-scrollkeeper-rarian.patch
+Patch1:         %{name}-%{version}-desktop.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	scrollkeeper
+BuildRequires:  scrollkeeper
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libgnomeui-devel
-BuildRequires:  perl-XML-Parser
+BuildRequires:  gtkspell-devel
+BuildRequires:  perl(XML::Parser)
 
+Requires:       yelp
+Requires:       which
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -27,8 +32,9 @@
 
 
 %prep
-%setup -q
-
+%setup -q 
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -38,12 +44,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
-  --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+desktop-file-install --vendor fedora --delete-original  \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        --remove-category Application \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper/
@@ -54,15 +60,11 @@
 
 ln doc/UMTF/ChangeLog ChangeLog.UMTF
 
-%check || :
-make check
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post 
+%post
 scrollkeeper-update -q || :
 
 %postun
@@ -71,7 +73,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
+%doc AUTHORS COPYING NEWS README THANKS TODO
 %doc doc/UMTF/README.UMTF ChangeLog.UMTF doc/UMTF/example.xml
 %{_bindir}/*
 %{_datadir}/gnome/help/gtranslator
@@ -81,10 +83,43 @@
 %{_datadir}/omf/gtranslator
 %{_datadir}/pixmaps/*.png
 %{_datadir}/pixmaps/gtranslator
-%{_mandir}/man[^3]/*
+%{_mandir}/man?/*
 
 
 %changelog
+* Tue Oct 23 2007 Sindre Pedersen Bjordal <foolish at guezz.net> - 1.1.7-7
+- Add patch to fix scrollkeeper configure issue
+* Tue Oct 02 2007 Sindre Pedersen Bjordal <foolish at guezz.net> - 1.1.7-5
+- Add missing dependency on which
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.1.7-4
+- Bump release for upgrade path
+
+* Fri Jun 08 2007 Sindre Pedersen BjÃ¸rdal <foolish at guezz.net> 1.1.7-3
+- Add yelp dependency, closes #243401
+* Tue Feb 13 2007 Sindre Pedersen BjÃ¸rdal <foolish at guezz.net> 1.1.7-2
+- Rebuild 
+
+* Mon Jan 22 2007 Sindre Pedersen BjÃ¸rdal <foolish at guezz.net> 1.1.7-1
+- Take over ownership of package
+- Update to 1.1.7
+
+* Mon Feb 13 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-3
+- Rebuild for Fedora Extras 5
+
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
+- Add %{?dist} tag
+- Rebuild
+
+* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 1.1.6-1
+- Updated to 1.1.6
+- Remove build patch as it's no longer needed
+
+* Wed May 11 2005 Josh Boyer <jwboyer at jdub.homelinux.org>
+- Added build fix
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Jun  2 2004 Marius L. JÃ¸hndal <mariuslj at ifi.uio.no> - 0:1.1.5-0.fdr.1
 - Updated to 1.1.5.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:37 -0000	1.2
+++ sources	11 Dec 2007 10:57:29 -0000	1.3
@@ -1 +1 @@
-2cd24e8471362ab76348fc202a1f957f  gtranslator-1.1.5.tar.gz
+47531195b74b22a6284dad609377cbb0  gtranslator-1.1.7.tar.bz2


