- 1.9.8

- TODO: -devel and -apidocs packages

Changed files:
    gtranslator-configure_in.patch -> 1.2
    gtranslator-disable-desktop-update.patch -> 1.1
    gtranslator-locale_names.patch -> 1.5
    gtranslator-rarian.patch -> 1.2
    gtranslator.spec -> 1.37

diff --git a/gtranslator-configure_in.patch b/gtranslator-configure_in.patch
deleted file mode 100644 (file)
index eea700c..0000000
--- a/gtranslator-configure_in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN gtranslator.orig/configure.in gtranslator/configure.in
---- gtranslator.orig/configure.in      Wed Jan  1 20:19:24 2003
-+++ gtranslator/configure.in   Wed Jan  1 20:21:09 2003
-@@ -19,6 +19,11 @@
- AC_PROG_INTLTOOL(0.22)
- 
- dnl -------------------------------------------------------------------
-+dnl Needed by newest automake
-+dnl -------------------------------------------------------------------
-+AC_PROG_RANLIB
-+
-+dnl -------------------------------------------------------------------
- dnl Standard bla-bla checks.
- dnl -------------------------------------------------------------------
- AC_ISC_POSIX

diff --git a/gtranslator-disable-desktop-update.patch b/gtranslator-disable-desktop-update.patch
new file mode 100644 (file)
index 0000000..4e7c44d
--- /dev/null
+++ b/gtranslator-disable-desktop-update.patch
@@ -0,0 +1,19 @@
+--- gtranslator-1.9.8/data/desktop/Makefile.am~        2010-02-07 20:38:35.000000000 +0100
++++ gtranslator-1.9.8/data/desktop/Makefile.am 2010-02-12 10:27:44.371499317 +0100
+@@ -19,16 +19,4 @@
+ 
+ CLEANFILES = $(Application_DATA)
+ 
+-UPDATE_DESKTOP = \
+-      if [ -f $(Applicationdir)/defaults.list ] ; then \
+-              if which update-desktop-database>/dev/null 2>&1 ; then \
+-                      update-desktop-database $(Applicationdir); \
+-              fi \
+-      fi
+-
+-install-data-hook:
+-      $(UPDATE_DESKTOP)
+-
+-uninstall-hook:
+-      $(UPDATE_DESKTOP) 
+ -include $(top_srcdir)/git.mk

diff --git a/gtranslator-locale_names.patch b/gtranslator-locale_names.patch
deleted file mode 100644 (file)
index 65d971e..0000000
--- a/gtranslator-locale_names.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtranslator-1.1.7/configure.in~    2007-12-30 21:54:45.994938945 +0100
-+++ gtranslator-1.1.7/configure.in     2007-12-30 21:56:40.353745991 +0100
-@@ -64,7 +64,7 @@
- GETTEXT_PACKAGE=gtranslator
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE(GETTEXT_PACKAGE,[gtranslator],[Package name for use by gettext library])
--ALL_LINGUAS="am az be bs ca cs da de el en_CA en_GB es et eu fa fi fr ga gl hr hu id is it ja ko lt lv nl nn no nb pa pl pt pt_BR ru sk sq sr sr@Latn sv ta tr th tk uk vi wa zh_CN zh_TW"
-+ALL_LINGUAS="am az be bs ca cs da de el en_CA en_GB es et eu fa fi fr ga gl hr hu id is it ja ko lt lv nl nn nb pa pl pt pt_BR ru sk sq sr sr@Latn sv ta tr th tk uk vi wa zh_CN zh_TW"
- AM_GLIB_GNU_GETTEXT
- AC_CHECK_FUNC(bind_textdomain_codeset,,[AC_CHECK_LIB(intl,bind_textdomain_codeset)])
- 

diff --git a/gtranslator-rarian.patch b/gtranslator-rarian.patch
deleted file mode 100644 (file)
index 63f5432..0000000
--- a/gtranslator-rarian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtranslator-1.1.7/configure.in.orig        2008-03-21 14:13:22.573701134 +0100
-+++ gtranslator-1.1.7/configure.in     2008-03-21 14:14:02.070986578 +0100
-@@ -122,7 +122,7 @@
- AC_CHECK_PROG(sc_present, scrollkeeper-config, yes, no)
- if test "z$sc_present" = "zyes" ; then
-       AC_MSG_CHECKING([for scrollkeeper])
--      _VERSION=`scrollkeeper-config --version|sed -e 's/\.//g'`
-+      _VERSION=`scrollkeeper-config --version|sed -e 's/ .*$// ; s/\.//g'`
-       if test $_VERSION -ge 0 -o $_VERSION -ge 02; then
-               AC_MSG_RESULT(yes)
-               SC_STATEDIR=`scrollkeeper-config --pkglocalstatedir`

diff --git a/gtranslator.spec b/gtranslator.spec
index c76fd5567f6ff68ea42b22aa59b7f36e9cd72dbb..f11a05e7c6601abd5ac39327568dd938f1345da5 100644 (file)
--- a/gtranslator.spec
+++ b/gtranslator.spec
@@ -1,19 +1,18 @@
 Summary:       gtranslator - a comfortable po file editor with many bells and whistles
 Summary(pl.UTF-8):     gtranslator - wygodny edytor plików po z różnymi wodotryskami
 Name:          gtranslator
-Version:       1.1.7
+Version:       1.9.8
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Development/Tools
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.1/%{name}-%{version}.tar.bz2
-# Source0-md5: 47531195b74b22a6284dad609377cbb0
-Patch0:                %{name}-configure_in.patch
-Patch1:                %{name}-locale_names.patch
-Patch2:                %{name}-rarian.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtranslator/1.9/%{name}-%{version}.tar.bz2
+# Source0-md5: 8f8b967eda9f228c680375fd731d5c6f
+Patch0:                %{name}-disable-desktop-update.patch
 URL:           http://gtranslator.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: gdl-devel >= 2.26.0
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.8.0
 BuildRequires: gnome-vfs2-devel >= 2.0.0
@@ -25,6 +24,8 @@ BuildRequires:        libgnomeui-devel >= 2.0.0
 BuildRequires: libxml2-devel >= 2.4.12
 BuildRequires: pkgconfig
 BuildRequires: scrollkeeper
+Requires(post,preun):  GConf2
+Requires(post,postun): hicolor-icon-theme
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,16 +41,11 @@ tłumaczeniach plików po.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-mv -f po/{no,nb}.po
-sed -i 's/Categories=.*/Categories=GTK;GNOME;Development;Translation;/' data/desktop/gtranslator.desktop.in
 
 %build
 %{__glib_gettextize}
 %{__intltoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__automake}
 %{__autoconf}
@@ -61,27 +57,44 @@ sed -i 's/Categories=.*/Categories=GTK;GNOME;Development;Translation;/' data/des
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       Applicationdir=%{_desktopdir}
+       DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.{a,la}
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /usr/bin/scrollkeeper-update
-%postun -p /usr/bin/scrollkeeper-update
+%post
+%gconf_schema_install gtranslator.schemas
+%update_icon_cache hicolor
+/usr/bin/scrollkeeper-update
+
+%preun
+%gconf_schema_uninstall gtranslator.schemas
+
+%postun
+%update_icon_cache hicolor
+/usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog DEPENDS HACKING NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/gtranslator.schemas
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/gtr*.plugin
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/colorschemes
 %{_datadir}/%{name}/dtd
-%attr(755,root,root) %{_datadir}/%{name}/scripts
-%{_datadir}/mime-info/*
+%{_datadir}/%{name}/pixmaps
+%{_datadir}/%{name}/ui
+%{_datadir}/%{name}/po.lang
+%{_datadir}/%{name}/*.xml
+%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/*/*.svg
 %{_pixmapsdir}/*
 %{_desktopdir}/*.desktop
 %{_mandir}/man1/*
-%{_omf_dest_dir}/%{name}