Hello community,
here is the log from the commit of package stardict for openSUSE:Factory
checked in at Fri Sep 9 11:52:49 CEST 2011.
--------
--- stardict/stardict.changes 2011-01-12 23:20:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/stardict/stardict.changes 2011-09-07 22:59:11.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Sep 6 01:09:08 UTC 2011 - kirill.kirillov@gmail.com
+
+- added stardict-3.0.3-improve-desktop-file.patch
+- added ru.po (fixed mistakes in Russian translation)
+
+-------------------------------------------------------------------
+Mon Sep 5 16:55:30 UTC 2011 - kirill.kirillov@gmail.com
+
+- added stardict-3.0.3-gcc46.patch
+- removed gucharmap dependency
+- fixed license tag
+- fixed spurious-executable-perm RPMLINT warning
+- cleaned spec using spec-cleaner
+
+-------------------------------------------------------------------
+Mon Apr 4 23:00:21 UTC 2011 - kirill.kirillov@gmail.com
+
+- updated to 3.0.3
+- dropped festival
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
LINGUAS
configure-festival.diff
fix_gethostbynamer.patch
lt.po
stardict-2.4.8-dont-install-omf.patch
stardict-3.0.1-festival.h-path-fix.patch
stardict-3.0.1-gcc44.patch
stardict-3.0.1-includes.patch
stardict-3.0.1.tar.bz2
stardict-adjust-path-for-sounds.patch
stardict-gucharmap.patch
stardict-rpmlintrc
stardict-transparent_trayicon.patch
stardict.desktop
New:
----
stardict-3.0.3-fix-path-for-sounds.patch
stardict-3.0.3-gcc46.patch
stardict-3.0.3-improve-desktop-file.patch
stardict-3.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stardict.spec ++++++
--- /var/tmp/diff_new_pack.zrDzIU/_old 2011-09-09 11:52:43.000000000 +0200
+++ /var/tmp/diff_new_pack.zrDzIU/_new 2011-09-09 11:52:43.000000000 +0200
@@ -15,49 +15,44 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: stardict
+Version: 3.0.3
+Release: 1
+License: GPLv3
Summary: A cross-platform and internationalized dictionary
-Version: 3.0.1
-Release: 70
-License: GPLv2+
+Url: http://code.google.com/p/stardict-3/
Group: Productivity/Office/Dictionary
-Url: http://stardict.sourceforge.net
Source0: %{name}-%{version}.tar.bz2
-Source1: stardict.desktop
-Source2: stardict-rpmlintrc
-Source3: ru.po
-Source4: lt.po
-Source5: LINGUAS
-Patch0: stardict-2.4.8-dont-install-omf.patch
-Patch1: stardict-3.0.1-festival.h-path-fix.patch
-Patch2: stardict-3.0.1-includes.patch
-Patch3: stardict-transparent_trayicon.patch
-Patch4: configure-festival.diff
-Patch5: stardict-gucharmap.patch
-Patch6: fix_gethostbynamer.patch
-Patch7: stardict-3.0.1-gcc44.patch
-Patch8: stardict-adjust-path-for-sounds.patch
-Requires: enchant festival espeak pulseaudio
-BuildRequires: gcc-c++ gnome-common intltool libgnomeui-devel perl-XML-Parser scrollkeeper sgml-skel
-BuildRequires: gucharmap-devel update-desktop-files
-# new in version 3.x: festival and espeak support
-BuildRequires: enchant-devel festival-devel libsigc++2-devel
-%if 0%{?suse_version} > 1020
-BuildRequires: fdupes
-%gconf_schemas_prereq
-%if 0%{?suse_version} > 1100
-BuildRequires: espeak-devel
-%else
-BuildRequires: espeak
-%endif
-%else
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
+Source1: ru.po
+# PATCH-FIX-OPENSUSE stardict-3.0.3-fix-path-for-sounds.patch -- adjust default path for sound files
+Patch0: stardict-3.0.3-fix-path-for-sounds.patch
+%if 0%{?suse_version}
+# PATCH-FIX-OPENSUSE stardict-3.0.3-improve-desktop-file.patch -- add GenericName entry
+Patch1: stardict-3.0.3-improve-desktop-file.patch
+# PATCH-FIX-UPSTREAM stardict-3.0.3-gcc46.patch -- rebased from Fedora package
+Patch2: stardict-3.0.3-gcc46.patch
+BuildRequires: update-desktop-files
%endif
+BuildRequires: enchant-devel
+BuildRequires: espeak-devel
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+BuildRequires: gnome-common
+BuildRequires: gnome-doc-utils-devel
+BuildRequires: gtk2 >= 2.20
+BuildRequires: intltool
+BuildRequires: libgnomeui-devel
+BuildRequires: libsigc++2-devel
+BuildRequires: perl-XML-Parser
+BuildRequires: sgml-skel
+# gucharmap now uses gtk3, but stardict still uses gtk2
+# BuildRequires: gucharmap-devel
+Requires: enchant
+Requires: espeak
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%gconf_schemas_prereq
%description
StarDict is a Cross-Platform and international dictionary written in
@@ -67,91 +62,58 @@
selection word","Fuzzy query" etc.
-
-Authors:
---------
- Maintainers:
- Hu Zheng http://forlinux.yeah.net
- Contributors:
- Alex Murygin
-
+%lang_package
%prep
%setup -q
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch0
+%patch1
+%patch2
+cp %{SOURCE1} dict/po/
+
# Remove unneeded sigc++ header files to make it sure
# that we are using system-wide libsigc++
find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f
-cp %{SOURCE3} po/
-cp %{SOURCE4} po/
-cp %{SOURCE5} po/
%build
autoreconf -fi
%configure \
+ --disable-tools \
--disable-schemas-install \
-%if 0%{?suse_version} < 1110
- --disable-gucharmap \
-%endif
- --disable-advertisement \
- --disable-updateinfo
-%{__make} %{?jobs:-j%jobs}
+ --disable-updateinfo \
+ --disable-scrollkeeper \
+ --disable-festival \
+ --disable-gucharmap
+make %{?_smp_mflags}
%install
-%if 0%{?suse_version} < 1030
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
-%makeinstall
-find %buildroot%{_libdir}/stardict/plugins -name "*.la" -print0 | xargs -0 rm -rf {} \;
+%make_install
+
+#fix spurious-executable-perm RPMLINT warning
+chmod 0644 COPYING
+
+find %{buildroot}%{_libdir}/stardict/plugins -name "*.la" -print0 | xargs -0 rm -rf {} \;
+
%find_lang %{name}
-%if 0%{?suse_version} > 1020
+
%find_gconf_schemas
cat %{name}.lang %{name}.schemas_list >%{name}.lst
-%else
-%{__install} -d -m755 %buildroot%{sysconfdir}/gconf/schemas/
-%{__mv} %buildroot%{_sysconfdir}/gconf/schemas/stardict.schemas %buildroot%{sysconfdir}/gconf/schemas/
-cat %{name}.lang >%{name}.lst
-%endif
-install -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/applications/stardict.desktop
+
%suse_update_desktop_file stardict Office Dictionary
# save space, create symlinks for identical files
-%if 0%{?suse_version} > 1020
-%fdupes -s %buildroot
-%endif
+%fdupes -s %{buildroot}
%clean
-rm -rf %buildroot
-%if 0%{?suse_version} > 1020
+rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
-# Remove orphan file created by stardict.spec in SuSE <= 10.2.
-# Can be removed after openSUSE 10.3.
-if [ -f var/adm/SuSEconfig/run-scrollkeeper-update ]; then
- rm -f var/adm/SuSEconfig/run-scrollkeeper-update 2>/dev/null
-fi
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
-%else
-
-%post
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-opt/gnome/bin/gconftool-2 --makefile-install-rule %{sysconfdir}/gconf/schemas/stardict.schemas >/dev/null
-touch var/adm/SuSEconfig/run-scrollkeeper-update
-%endif
%files -f %{name}.lst
%defattr(-,root,root)
-%doc %{_mandir}/man?/*.*
-%doc doc/FAQ doc/HACKING doc/HowToCreateDictionary README AUTHORS COPYING TODO
+%doc dict/doc/FAQ dict/doc/HACKING dict/doc/HowToCreateDictionary dict/doc/StarDictFileFormat dict/doc/Translation dict/AUTHORS COPYING dict/ChangeLog dict/README
%{_libdir}/bonobo/servers/*
%{_libdir}/stardict
%{_bindir}/*
@@ -160,6 +122,7 @@
%{_datadir}/omf
%{_datadir}/pixmaps/*.png
%{_datadir}/stardict
+%{_mandir}/man1/stardict.1.gz
%if 0%{?suse_version} < 1030
%dir %{_libdir}/bonobo
%dir %{_libdir}/bonobo/servers
++++++ ru.po ++++++
++++ 3818 lines (skipped)
++++ between stardict/ru.po
++++ and /mounts/work_src_done/STABLE/stardict/ru.po
++++++ stardict-3.0.3-fix-path-for-sounds.patch ++++++
Index: dict/src/conf.cpp
===================================================================
--- dict/src/conf.cpp.orig
+++ dict/src/conf.cpp
@@ -196,8 +196,8 @@ AppConf::AppConf() :
// stores absolute and relative paths
add_entry("/apps/stardict/preferences/dictionary/tts_path", pathlist);
#else
- pathlist.push_back("/usr/share/WyabdcRealPeopleTTS");
- pathlist.push_back("/usr/share/OtdRealPeopleTTS");
+ pathlist.push_back("/usr/share/stardict/WyabdcRealPeopleTTS");
+ pathlist.push_back("/usr/share/stardict/OtdRealPeopleTTS");
add_entry("/apps/stardict/preferences/dictionary/tts_path", pathlist);
#endif
}
++++++ stardict-3.0.1-gcc44.patch -> stardict-3.0.3-gcc46.patch ++++++
--- stardict/stardict-3.0.1-gcc44.patch 2009-06-09 07:30:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/stardict/stardict-3.0.3-gcc46.patch 2011-09-05 21:44:51.000000000 +0200
@@ -1,24 +1,12 @@
-Index: stardict-3.0.1/src/lib/data.cpp
+Index: dict/stardict-plugins/stardict-wordnet-plugin/scene.h
===================================================================
---- stardict-3.0.1.orig/src/lib/data.cpp 2009-05-26 13:47:53.000000000 +0800
-+++ stardict-3.0.1/src/lib/data.cpp 2009-05-26 13:52:22.000000000 +0800
+--- dict/stardict-plugins/stardict-wordnet-plugin/scene.h.orig
++++ dict/stardict-plugins/stardict-wordnet-plugin/scene.h
@@ -28,6 +28,7 @@
- #include "data.hpp"
- #include "getuint32.h"
+ #include "partic.h"
+ #include "spring.h"
-+#include <cstdio>
-
- DictBase::DictBase()
- {
-Index: stardict-3.0.1/src/lib/stardict_client.cpp
-===================================================================
---- stardict-3.0.1.orig/src/lib/stardict_client.cpp 2009-05-26 13:47:53.000000000 +0800
-+++ stardict-3.0.1/src/lib/stardict_client.cpp 2009-05-26 14:01:52.000000000 +0800
-@@ -32,6 +32,7 @@
- #include "getuint32.h"
-
- #include "stardict_client.hpp"
-+#include <cstdio>
-
- #define PROTOCOL_VERSION "0.3"
++#include <cstddef>
+ #include <vector>
+ using namespace std;
++++++ stardict-3.0.3-improve-desktop-file.patch ++++++
Index: dict/data/stardict.desktop.in
===================================================================
--- dict/data/stardict.desktop.in.orig
+++ dict/data/stardict.desktop.in
@@ -1,11 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
_Name=StarDict
+_GenericName=Dictionary
_Comment=Lookup words
Exec=stardict
Terminal=false
Type=Application
-Icon=stardict.png
+Icon=stardict
StartupNotify=true
Categories=Utility;Dictionary;
X-GNOME-DocPath=stardict/stardict.xml
++++++ stardict-3.0.1.tar.bz2 -> stardict-3.0.3.tar.bz2 ++++++
stardict/stardict-3.0.1.tar.bz2 /mounts/work_src_done/STABLE/stardict/stardict-3.0.3.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
