From ad3681e92cc429b2f9f1d9d6836a57199a76c24f9fd592c02c97176398af6ab5 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 25 Jun 2013 05:52:18 +0000 Subject: [PATCH 1/3] Accepting request 180792 from home:MargueriteSu:branches:Archiving fix bnc#821877 OBS-URL: https://build.opensuse.org/request/show/180792 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/librcc?expand=0&rev=7 --- libguess.c-64bit-portability.patch | 16 +++++++ librcc-0.2.10-libguess.patch | 68 ++++++++++++++++++++++++++++++ librcc.changes | 16 +++++++ librcc.spec | 19 ++++++--- 4 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 libguess.c-64bit-portability.patch create mode 100644 librcc-0.2.10-libguess.patch diff --git a/libguess.c-64bit-portability.patch b/libguess.c-64bit-portability.patch new file mode 100644 index 0000000..b3b5d16 --- /dev/null +++ b/libguess.c-64bit-portability.patch @@ -0,0 +1,16 @@ +Index: librcc-0.2.10/engines/libguess.c +=================================================================== +--- librcc-0.2.10.orig/engines/libguess.c ++++ librcc-0.2.10/engines/libguess.c +@@ -21,6 +21,11 @@ + #include + + #include ++ ++#ifndef LIBGUESS_CORE ++#define LIBGUESS_CORE ++#endif ++ + #include + + #define UTF8_ID 0 diff --git a/librcc-0.2.10-libguess.patch b/librcc-0.2.10-libguess.patch new file mode 100644 index 0000000..824699b --- /dev/null +++ b/librcc-0.2.10-libguess.patch @@ -0,0 +1,68 @@ +Index: librcc-0.2.10/configure.in +=================================================================== +--- librcc-0.2.10.orig/configure.in ++++ librcc-0.2.10/configure.in +@@ -208,7 +208,7 @@ ENCA_LIBS="" + ENCA_INCLUDES="" + HAVE_ENCA=no + LIBGUESS_LIBS="" +-LIBGUESS_INCLUDES="" ++LIBGUESS_CFLAGS="" + HAVE_LIBGUESS=no + + AC_ARG_ENABLE( force-dynamic-engines, +@@ -230,12 +230,7 @@ if test "x$enable_force_dynamic_engines" + ])]) + fi + +-AC_CHECK_HEADER(libguess.h, [AC_CHECK_LIB(guess, guess_jp, [ +- AC_DEFINE(HAVE_LIBGUESS,1,[Defines if libguess is available]) +- LIBGUESS_LIBS="-lguess" +- LIBGUESS_INCLUDES="" +- HAVE_LIBGUESS=yes +-])]) ++PKG_CHECK_MODULES(LIBGUESS, libguess >= 1.0, HAVE_LIBGUESS=yes, HAVE_LIBGUESS=no) + + AM_CONDITIONAL(HAVE_RCD, [ test "x$HAVE_RCD" = "xyes" ]) + AM_CONDITIONAL(HAVE_ENCA, [ test "x$HAVE_ENCA" = "xyes" ]) +@@ -246,7 +241,7 @@ AC_SUBST(RCD_INCLUDES) + AC_SUBST(ENCA_LIBS) + AC_SUBST(ENCA_INCLUDES) + AC_SUBST(LIBGUESS_LIBS) +-AC_SUBST(LIBGUESS_INCLUDES) ++AC_SUBST(LIBGUESS_CFLAGS) + + USE_DLOPEN=no + if test "x$HAVE_DLOPEN" = "xyes"; then +Index: librcc-0.2.10/engines/Makefile.am +=================================================================== +--- librcc-0.2.10.orig/engines/Makefile.am ++++ librcc-0.2.10/engines/Makefile.am +@@ -21,4 +21,4 @@ western_engine_la_LDFLAGS = -module -avo + western_engine_la_LIBADD = ../src/librcc.la + + +-AM_CPPFLAGS = -I../src @RCD_INCLUDES@ @LIBGUESS_INCLUDES@ ++AM_CPPFLAGS = -I../src @RCD_INCLUDES@ @LIBGUESS_CFLAGS@ +Index: librcc-0.2.10/engines/libguess.c +=================================================================== +--- librcc-0.2.10.orig/engines/libguess.c ++++ librcc-0.2.10/engines/libguess.c +@@ -64,7 +64,7 @@ struct rcc_guess_engine_t guessJPEngine + &guessDetect, + {"UTF-8", "UTF-16", "ISO-2022-JP", "EUC-JP", "SJIS", NULL} + }, +- &guess_jp ++ NULL + }; + + struct rcc_guess_engine_t guessZHEngine = { +@@ -110,7 +110,7 @@ struct rcc_guess_engine_t guessKREngine + &guessDetect, + {"UTF-8", "UTF-16", "ISO-2022-KR", "EUC-KR", "JOHAB", NULL} + }, +- &guess_kr ++ NULL + }; + + diff --git a/librcc.changes b/librcc.changes index 3950a75..d253a21 100644 --- a/librcc.changes +++ b/librcc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jun 24 20:55:48 UTC 2013 - i@marguerite.su + +- add dependency: libguess + * for CJK charsets detection, or unzip fails(bnc#821877) +- add patch: librcc-0.2.10-libguess.patch + * enable libguess +- add patch: libguess.c-64bit-portability.patch + * fix 64bit portability issue libguess.c:48 +- enable libtranslate +- fix rcc-runtime dependency for librcc0 + * rcc-runtime should be dependency for librcc0 + instead of librcc + * without rcc-runtime, there'll be no engines, + thus librcc0 is useless then + ------------------------------------------------------------------- Thu Dec 20 21:09:11 UTC 2012 - lazy.kent@opensuse.org diff --git a/librcc.spec b/librcc.spec index 7208f8a..5987405 100644 --- a/librcc.spec +++ b/librcc.spec @@ -1,7 +1,7 @@ # # spec file for package librcc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -27,16 +27,21 @@ Url: http://rusxmms.sourceforge.net Source0: http://dside.dyndns.org/files/rusxmms/%{name}-%{version}.tar.bz2 Source1: baselibs.conf # PATCH-FIX-UPSTREAM librcc-0.2.9-czech_config.patch lazy.kent.suse@gmail.com -- fix Czech locale code in config file -Patch3: librcc-0.2.9-czech_config.patch +Patch1: librcc-0.2.9-czech_config.patch +# PATCH-FIX-UPSTREAM librcc-0.2.10-libguess.patch marguerite@opensuse.org -- enable libguess +Patch2: librcc-0.2.10-libguess.patch +# PATCH-FIX-UPSTREAM libguess.c-64bit-portability.patch marguerite@opensuse.org -- fix 64bit portability issuse libguess.c:48/49 +Patch3: libguess.c-64bit-portability.patch BuildRequires: aspell-devel BuildRequires: db-devel +BuildRequires: libguess-devel BuildRequires: librcd-devel BuildRequires: libtool +BuildRequires: libtranslate-devel BuildRequires: pkg-config BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(libxml-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: rcc-runtime = %{version} Supplements: packageand(unzip:aspell) %description @@ -47,6 +52,7 @@ library is part of rusxmms patch. %package -n %lname Summary: Russian Charset Conversion Library Group: System/Libraries +Requires: rcc-runtime = %{version} %description -n %lname Provides posibility to automaticaly convert considered encodings (a lot @@ -70,14 +76,15 @@ Runtime environment for the package LibRCC. %prep %setup -qn %{name}-%{version} -%patch3 +%patch1 +%patch2 -p1 +%patch3 -p1 %build ./autogen.sh %configure \ --disable-static \ - --disable-libtranslate \ - --disable-gtk2 + --enable-force-system-iconv make %{?_smp_mflags} %install From b2a7ffd3092e8a63f73bc168a62281e757dcd203186184355f1917d214fe691f Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Tue, 25 Jun 2013 14:51:59 +0000 Subject: [PATCH 2/3] - download source tarball again, the former one did not match OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/librcc?expand=0&rev=8 --- librcc-0.2.10.tar.bz2 | 4 ++-- librcc.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/librcc-0.2.10.tar.bz2 b/librcc-0.2.10.tar.bz2 index 2267d6b..2726398 100644 --- a/librcc-0.2.10.tar.bz2 +++ b/librcc-0.2.10.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0080d7a15b453d4a76719496d7b88425ffef4a55278694996467989d2d22361 -size 469008 +oid sha256:ac0c743dde6f816aca37108ca489d02bbe1068d0b38abb648e918dd356584553 +size 465060 diff --git a/librcc.changes b/librcc.changes index d253a21..2aad17b 100644 --- a/librcc.changes +++ b/librcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 25 14:51:28 UTC 2013 - mvyskocil@suse.com + +- download source tarball again, the former one did not match + ------------------------------------------------------------------- Mon Jun 24 20:55:48 UTC 2013 - i@marguerite.su From 35596e325913ad28d45ce8de026f06af5c9fc4a343d09cf1513d6d9c6d4bd9c7 Mon Sep 17 00:00:00 2001 From: Kyrill Detinov Date: Tue, 16 Jul 2013 11:58:37 +0000 Subject: [PATCH 3/3] Fix Supplements tag placement. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/librcc?expand=0&rev=9 --- librcc.changes | 5 +++++ librcc.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/librcc.changes b/librcc.changes index 2aad17b..b72a252 100644 --- a/librcc.changes +++ b/librcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 16 11:54:39 UTC 2013 - lazy.kent@opensuse.org + +- Fix Supplements tag placement. + ------------------------------------------------------------------- Tue Jun 25 14:51:28 UTC 2013 - mvyskocil@suse.com diff --git a/librcc.spec b/librcc.spec index 5987405..0baa45b 100644 --- a/librcc.spec +++ b/librcc.spec @@ -42,7 +42,6 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(libxml-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build -Supplements: packageand(unzip:aspell) %description Provides posibility to automaticaly convert considered encodings (a lot @@ -53,6 +52,7 @@ library is part of rusxmms patch. Summary: Russian Charset Conversion Library Group: System/Libraries Requires: rcc-runtime = %{version} +Supplements: packageand(unzip:aspell) %description -n %lname Provides posibility to automaticaly convert considered encodings (a lot