commit stardict-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at 2017-12-19 10:58:54
Comparing /work/SRC/openSUSE:Factory/stardict-tools (Old)
and /work/SRC/openSUSE:Factory/.stardict-tools.new (New)
Package is "stardict-tools"
Tue Dec 19 10:58:54 2017 rev:22 rq:558086 version:3.0.1
Changes:
--- /work/SRC/openSUSE:Factory/stardict-tools/stardict-tools.changes
2016-07-05 09:51:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.stardict-tools.new/stardict-tools.changes
2017-12-19 10:58:56.048056656 +0100
@@ -1,0 +2,7 @@
+Sun Dec 10 04:46:08 UTC 2017 - i...@marguerite.su
+
+- add patch: stardict-tools-3.0.1-wikipediaImage.patch
+ * fix boo#1067895
+ * fix MYSQL_PORT undefined
+
+---
New:
stardict-tools-3.0.1-wikipediaImage.patch
Other differences:
--
++ stardict-tools.spec ++
--- /var/tmp/diff_new_pack.VtglKF/_old 2017-12-19 10:58:56.820019391 +0100
+++ /var/tmp/diff_new_pack.VtglKF/_new 2017-12-19 10:58:56.824019198 +0100
@@ -1,7 +1,7 @@
#
# spec file for package stardict-tools
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,18 +31,18 @@
Patch2: stardict-tools-3.0.1-destbufferoverflow.patch
Patch3: stardict-tools-3.0.1-gcc44.patch
Patch4: stardict-tools-3.0.1-gcc6.patch
+Patch5: stardict-tools-3.0.1-wikipediaImage.patch
BuildRequires: dos2unix
BuildRequires: gcc-c++
BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: pcre-devel
BuildRequires: update-desktop-files
Recommends: dictd
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} < 1010
BuildRequires: pkgconfig
%else
BuildRequires: libtool
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} > 1020
BuildRequires: libmysqlclient-devel
@@ -60,6 +60,7 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%build
autoreconf -fiv
++ stardict-tools-3.0.1-wikipediaImage.patch ++
Index: stardict-tools-3.0.1/src/wikipediaImage.cpp
===
--- stardict-tools-3.0.1.orig/src/wikipediaImage.cpp
+++ stardict-tools-3.0.1/src/wikipediaImage.cpp
@@ -6,6 +6,7 @@
#define CONN_HOST "localhost"
#define CONN_USER "wikiuser"
#define CONN_PASS "123"
+#define CONN_PORT 3306
#define CONN_DB "wikidb"
@@ -14,7 +15,7 @@ void dump_file()
MYSQL mysql;
if (!mysql_init())
return;
- if (!mysql_real_connect(, CONN_HOST , CONN_USER , CONN_PASS, NULL
, MYSQL_PORT, NULL, 0))
+ if (!mysql_real_connect(, CONN_HOST , CONN_USER , CONN_PASS, NULL
, CONN_PORT, NULL, 0))
return;
if (mysql_select_db(, CONN_DB))
return;
commit stardict-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at 2016-07-05 09:51:30
Comparing /work/SRC/openSUSE:Factory/stardict-tools (Old)
and /work/SRC/openSUSE:Factory/.stardict-tools.new (New)
Package is "stardict-tools"
Changes:
--- /work/SRC/openSUSE:Factory/stardict-tools/stardict-tools.changes
2011-11-22 17:49:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.stardict-tools.new/stardict-tools.changes
2016-07-05 09:51:32.0 +0200
@@ -1,0 +2,7 @@
+Mon Jun 20 10:06:44 UTC 2016 - i...@marguerite.su
+
+- add patch: stardict-tools-3.0.1-gcc6.patch
+ * fix boo#985116
+ * fix narrowing conversion from int to char inside {}
+
+---
Old:
stardict-tools.README.SuSE
New:
stardict-tools-3.0.1-gcc6.patch
stardict-tools.README.SUSE
Other differences:
--
++ stardict-tools.spec ++
--- /var/tmp/diff_new_pack.NMW1W4/_old 2016-07-05 09:51:33.0 +0200
+++ /var/tmp/diff_new_pack.NMW1W4/_new 2016-07-05 09:51:33.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package stardict-tools
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,64 +15,62 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: stardict-tools
-Summary:StarDict Editor
Version:3.0.1
-Release:59
+Release:0
+Summary:StarDict Editor
License:GPL-2.0+
-Url:http://stardict.sourceforge.net
Group: Productivity/Office/Dictionary
+Url:http://stardict.sourceforge.net
Source: %{name}-%{version}.tar.bz2
-Source1:%{name}.README.SuSE
+Source1:%{name}.README.SUSE
Source2:stardict-editor.png
Source3:stardict-tools-rpmlintrc
Patch1: stardict-tools-3.0.1-includes.patch
Patch2: stardict-tools-3.0.1-destbufferoverflow.patch
Patch3: stardict-tools-3.0.1-gcc44.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Patch4: stardict-tools-3.0.1-gcc6.patch
+BuildRequires: dos2unix
+BuildRequires: gcc-c++
BuildRequires: gtk2-devel >= 2.6.0
+BuildRequires: pcre-devel
+BuildRequires: update-desktop-files
+Recommends: dictd
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} < 1010
BuildRequires: pkgconfig
%else
-BuildRequires: libtool pkg-config
+BuildRequires: libtool
+BuildRequires: pkg-config
%endif
%if 0%{?suse_version} > 1020
BuildRequires: libmysqlclient-devel
%else
BuildRequires: mysql-devel
%endif
-BuildRequires: gcc-c++ pcre-devel
-BuildRequires: dos2unix update-desktop-files
%description
This package contains the dictionary conversion tools which can convert
dictionaries of DICT, wquick, mova and pydict to stardict format.
-
-
-Authors:
-
-Hu Zheng
-
%prep
%setup -q
%patch1 -p1
%patch2
%patch3
+%patch4 -p1
%build
autoreconf -fiv
%configure --with-pic --disable-static
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
%install
-%{makeinstall}
-%{__install} -d -m755 %buildroot/%{_libdir}/%{name}
-%{__install} -d -m755 %buildroot/%{_datadir}/{%{name},pixmaps}
-%{__install} -d -m755 %buildroot/%{_defaultdocdir}/%{name}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
+install -d -m755 %{buildroot}/%{_libdir}/%{name}
+install -d -m755 %{buildroot}/%{_datadir}/{%{name},pixmaps}
+install -d -m755 %{buildroot}/%{_defaultdocdir}/%{name}
pushd src 1>/dev/null
# install noinst_PROGRAMS in libdir
for file in $(grep noinst_PROGRAMS Makefile.am | sed -e 's/noinst_PROGRAMS =
//'); do
@@ -80,33 +78,30 @@
if [[ $file == *.exe ]]; then
continue;
else
- %{__install} -m755 $file %buildroot/%{_libdir}/%{name}/
+ install -m755 $file %{buildroot}/%{_libdir}/%{name}/
fi;
fi
done
# install scripts in sharedir
for file in uyghur2dict.py mkguangyunst.py stmerge.py
KangXiZiDian-djvu2tiff.py; do
- echo '#!/usr/bin/python' > "${file}.tmp"
+ echo '#!%{_bindir}/python' > "${file}.tmp"
cat "$file" >> "${file}.tmp"
mv -f "${file}.tmp" "$file"
chmod 755 "$file"
done
for file in *.py *.pl *.perl; do
- dos2unix -q -n $file %buildroot/%{_datadir}/%{name}/$file
- sed -i 's|^#!/usr/bin/env python.*|#!/usr/bin/python|'
%buildroot/%{_datadir}/%{name}/$file
- chmod 755
commit stardict-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at 2011-12-06 19:05:56
Comparing /work/SRC/openSUSE:Factory/stardict-tools (Old)
and /work/SRC/openSUSE:Factory/.stardict-tools.new (New)
Package is stardict-tools, Maintainer is lr...@suse.com
Changes:
Other differences:
--
++ stardict-tools.spec ++
--- /var/tmp/diff_new_pack.rxMXUk/_old 2011-12-06 19:38:57.0 +0100
+++ /var/tmp/diff_new_pack.rxMXUk/_new 2011-12-06 19:38:57.0 +0100
@@ -22,7 +22,7 @@
Summary:StarDict Editor
Version:3.0.1
Release:59
-License:GPL v2 or later
+License:GPL-2.0+
Url:http://stardict.sourceforge.net
Group: Productivity/Office/Dictionary
Source: %{name}-%{version}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit stardict-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at 2011-11-22 17:49:36
Comparing /work/SRC/openSUSE:Factory/stardict-tools (Old)
and /work/SRC/openSUSE:Factory/.stardict-tools.new (New)
Package is stardict-tools, Maintainer is lr...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/stardict-tools/stardict-tools.changes
2011-09-26 10:36:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.stardict-tools.new/stardict-tools.changes
2011-11-22 17:49:47.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 20 06:29:09 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+---
Other differences:
--
++ stardict-tools.spec ++
--- /var/tmp/diff_new_pack.B0A96F/_old 2011-11-22 17:49:49.0 +0100
+++ /var/tmp/diff_new_pack.B0A96F/_new 2011-11-22 17:49:49.0 +0100
@@ -37,7 +37,7 @@
%if 0%{?suse_version} 1010
BuildRequires: pkgconfig
%else
-BuildRequires: pkg-config
+BuildRequires: libtool pkg-config
%endif
%if 0%{?suse_version} 1020
BuildRequires: libmysqlclient-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit stardict-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at Mon Sep 26 10:36:46 CEST 2011.
--- stardict-tools/stardict-tools.changes 2009-06-19 11:07:16.0
+0200
+++ /mounts/work_src_done/STABLE/stardict-tools/stardict-tools.changes
2011-09-25 18:14:11.0 +0200
@@ -1,0 +2,5 @@
+Sun Sep 25 16:13:35 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix build by linking with libz as well.
+
+---
calling whatdependson for head-i586
Other differences:
--
++ stardict-tools.spec ++
--- /var/tmp/diff_new_pack.JEkPe0/_old 2011-09-26 10:36:42.0 +0200
+++ /var/tmp/diff_new_pack.JEkPe0/_new 2011-09-26 10:36:42.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package stardict-tools (Version 3.0.1)
+# spec file for package stardict-tools
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -64,9 +64,7 @@
%patch3
%build
-# This package failed when testing with -Wl,-as-needed being default.
-# So we disable it here, if you want to retest, just delete this comment and
the line below.
-export SUSE_ASNEEDED=0
+autoreconf -fiv
%configure --with-pic --disable-static
%{__make} %{?jobs:-j%jobs}
++ stardict-tools-3.0.1-gcc44.patch ++
--- /var/tmp/diff_new_pack.JEkPe0/_old 2011-09-26 10:36:42.0 +0200
+++ /var/tmp/diff_new_pack.JEkPe0/_new 2011-09-26 10:36:42.0 +0200
@@ -1,5 +1,3 @@
-Index: src/bgl2txt.cpp
-===
--- src/bgl2txt.cpp.orig
+++ src/bgl2txt.cpp
@@ -1,3 +1,4 @@
@@ -7,8 +5,6 @@
#include cstring
#include libbgl2txt.h
-Index: src/KangXi.cpp
-===
--- src/KangXi.cpp.orig
+++ src/KangXi.cpp
@@ -57,7 +57,7 @@ void parse_line(const char *line)
@@ -20,8 +16,6 @@
p = strchr(line, '\t');
if (!p) {
g_print(Error: %s\n, line);
-Index: src/Unihan.cpp
-===
--- src/Unihan.cpp.orig
+++ src/Unihan.cpp
@@ -58,7 +58,7 @@ void parse_line(const char *line)
@@ -42,3 +36,39 @@
if (!p) {
g_print(Error: %s\n, line);
return;
+--- configure.in.orig
configure.in
+@@ -7,11 +7,12 @@ AC_CONFIG_SRCDIR([src/stardict-editor.cp
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AC_CONFIG_HEADER([config.h])
+
+-AM_PROG_LIBTOOL
+-
+ # Checks for programs.
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AC_PROG_CXX
++AM_PROG_LIBTOOL
+
+ # Checks for libraries.
+
+@@ -27,16 +28,10 @@ PKG_CHECK_MODULES(STARDICT, $DEP_MODULES
+
+ STARDICT_CFLAGS=-Wall $STARDICT_CFLAGS
+
+-LFS_CFLAGS=`getconf LFS_CFLAGS`
+-LFS_LDFLAGS=`getconf LFS_LDFLAGS`
+-LFS_LIBS=`getconf LFS_LIBS`
+-AC_SUBST(LFS_CFLAGS)
+-AC_SUBST(LFS_LDFLAGS)
+-AC_SUBST(LFS_LIBS)
+-
+ dnl For src/dsl2dict.c
+ PKG_CHECK_MODULES(DSL2DICT, libpcre)
+
++AC_SEARCH_LIBS(gzclose, z)
+
+ AC_OUTPUT([
+ Makefile
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
