rpms/gtranslator/F-11 gtranslator-1.9.5-fix-update-desktop-database.patch, NONE, 1.1 gtranslator.spec, 1.23, 1.24 sources, 1.7, 1.8
Alexey Torkhov
atorkhov at fedoraproject.org
Tue Jun 2 20:53:04 UTC 2009
- Previous message: rpms/udev-extras/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 udev-extras.spec, 1.9, 1.10
- Next message: rpms/python-lxml/F-11 .cvsignore, 1.25, 1.26 python-lxml.spec, 1.34, 1.35 sources, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atorkhov
Update of /cvs/pkgs/rpms/gtranslator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13371
Modified Files:
gtranslator.spec sources
Added Files:
gtranslator-1.9.5-fix-update-desktop-database.patch
Log Message:
* Sat May 30 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.5-1
- Update to 1.9.5 with help of patch by Arkady Shane. New version required a bunch of changes:
- Dropped old patches
- Adjust Requires
- Added new scriplets
gtranslator-1.9.5-fix-update-desktop-database.patch:
--- NEW FILE gtranslator-1.9.5-fix-update-desktop-database.patch ---
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.am gtranslator-1.9.5/data/desktop/Makefile.am
--- gtranslator-1.9.5.orig/data/desktop/Makefile.am 2009-04-11 05:03:51.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.am 2009-05-30 16:41:48.000000000 +0400
@@ -22,9 +22,9 @@
CLEANFILES = $(Application_DATA)
UPDATE_DESKTOP = \
- if [ -f $(Applicationdir)/defaults.list ] ; then \
+ if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
if which update-desktop-database>/dev/null 2>&1 ; then \
- update-desktop-database $(Applicationdir); \
+ update-desktop-database $(DESTDIR)$(Applicationdir); \
fi \
fi
@@ -32,4 +32,4 @@
$(UPDATE_DESKTOP)
uninstall-hook:
- $(UPDATE_DESKTOP)
\ РконÑе Ñайла Ð½ÐµÑ Ð½Ð¾Ð²Ð¾Ð¹ ÑÑÑоки
+ $(UPDATE_DESKTOP)
diff -ur gtranslator-1.9.5.orig/data/desktop/Makefile.in gtranslator-1.9.5/data/desktop/Makefile.in
--- gtranslator-1.9.5.orig/data/desktop/Makefile.in 2009-04-11 05:38:53.000000000 +0400
+++ gtranslator-1.9.5/data/desktop/Makefile.in 2009-05-30 16:42:04.000000000 +0400
@@ -252,9 +252,9 @@
CLEANFILES = $(Application_DATA)
UPDATE_DESKTOP = \
- if [ -f $(Applicationdir)/defaults.list ] ; then \
+ if [ -f $(DESTDIR)$(Applicationdir)/defaults.list ] ; then \
if which update-desktop-database>/dev/null 2>&1 ; then \
- update-desktop-database $(Applicationdir); \
+ update-desktop-database $(DESTDIR)$(Applicationdir); \
fi \
fi
Index: gtranslator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-11/gtranslator.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gtranslator.spec 25 Feb 2009 02:35:47 -0000 1.23
+++ gtranslator.spec 2 Jun 2009 20:52:34 -0000 1.24
@@ -1,28 +1,38 @@
Name: gtranslator
-Version: 1.1.7
-Release: 10%{?dist}
-
+Version: 1.9.5
+Release: 1%{?dist}
Summary: Gettext po file editor for GNOME
Group: Development/Tools
License: GPLv2+
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
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.9/%{name}-%{version}.tar.bz2
+# Should be sent upstream
+Patch0: %{name}-1.9.5-fix-update-desktop-database.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: scrollkeeper
-BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: libgnomeui-devel
-BuildRequires: gtkspell-devel
+BuildRequires: db4-devel
+BuildRequires: GConf2-devel, gtksourceview2-devel
+BuildRequires: apr-devel, apr-util-devel, neon-devel, subversion-devel
+BuildRequires: gtkspell-devel, libsoup-devel, gucharmap-devel, gnome-utils-devel
+BuildRequires: libgdl-devel
BuildRequires: perl(XML::Parser)
+BuildRequires: desktop-file-utils
+BuildRequires: scrollkeeper, intltool
+BuildRequires: gnome-doc-utils
+# For libuuid:
+BuildRequires: e2fsprogs-devel
Requires: yelp
Requires: which
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
%description
gtranslator is an enhanced gettext po file editor for the GNOME
@@ -31,19 +41,30 @@ features many comfortable everyday usage
replace functions, auto translation, and translation learning,
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} glib2-devel gtk2-devel gettext-devel gtksourceview2-devel libxml2-devel
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q
+%patch0 -p1 -z .fix-update
+
%build
-%configure
+%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -52,41 +73,69 @@ desktop-file-install --vendor fedora --d
%find_lang %{name}
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper/
-mv $RPM_BUILD_ROOT%{_datadir}/gtranslator/scripts/my-update.sh $RPM_BUILD_ROOT%{_bindir}/gtranslator-update
-mv $RPM_BUILD_ROOT%{_datadir}/gtranslator/scripts/cleanup-gtranslator-settings.sh $RPM_BUILD_ROOT%{_bindir}/gtranslator-cleanup-settings
-mv $RPM_BUILD_ROOT%{_datadir}/gtranslator/scripts/build-gtranslator-learn-buffer.sh $RPM_BUILD_ROOT%{_bindir}/gtranslator-build-learn-buffer
-rmdir $RPM_BUILD_ROOT%{_datadir}/gtranslator/scripts
-
ln doc/UMTF/ChangeLog ChangeLog.UMTF
+
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+if [ "$1" -gt 1 ] ; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+fi
+
%post
scrollkeeper-update -q || :
+update-desktop-database &> /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+
+%preun
+if [ "$1" -eq 0 ] ; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
%postun
scrollkeeper-update -q || :
+update-desktop-database &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README THANKS TODO
-%doc doc/UMTF/README.UMTF ChangeLog.UMTF doc/UMTF/example.xml
-%{_bindir}/*
+%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
+%doc doc/UMTF/README.UMTF ChangeLog.UMTF doc/UMTF/example.xml doc/UMTF/umtf.dtd
+%{_sysconfdir}/gconf/schemas/gtranslator.schemas
+%{_bindir}/gtranslator
+%{_libdir}/gtranslator
%{_datadir}/gnome/help/gtranslator
+%{_datadir}/gtk-doc/html/gtranslator
%{_datadir}/applications/*.desktop
-%{_datadir}/gtranslator
-%{_datadir}/mime-info/*
+%{_datadir}/%{name}
%{_datadir}/omf/gtranslator
%{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/gtranslator
%{_mandir}/man?/*
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/gtranslator-2.0
+%{_libdir}/pkgconfig/gtranslator.pc
+
+
%changelog
+* Sat May 30 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.9.5-1
+- Update to 1.9.5 with help of patch by Arkady Shane. New version required a bunch of changes:
+- Dropped old patches
+- Adjust Requires
+- Added new scriplets
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtranslator/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 12 Feb 2007 23:34:03 -0000 1.7
+++ sources 2 Jun 2009 20:52:34 -0000 1.8
@@ -1 +1 @@
-47531195b74b22a6284dad609377cbb0 gtranslator-1.1.7.tar.bz2
+66c7cc9c5cf2c085f3c7e74d9cb0cba9 gtranslator-1.9.5.tar.bz2
- Previous message: rpms/udev-extras/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 udev-extras.spec, 1.9, 1.10
- Next message: rpms/python-lxml/F-11 .cvsignore, 1.25, 1.26 python-lxml.spec, 1.34, 1.35 sources, 1.25, 1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list