Accepting request 183699 from devel:libraries:c_c++

Now depends on libguess.

OBS-URL: https://build.opensuse.org/request/show/183699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librcc?expand=0&rev=5

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 <string.h>
+ 
+ #include <librcc.h>
++
++#ifndef LIBGUESS_CORE
++#define LIBGUESS_CORE
++#endif
++
+ #include <libguess.h>
+ 
+ #define UTF8_ID 0

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
+ };
+         
+     

librcc-0.2.10.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0080d7a15b453d4a76719496d7b88425ffef4a55278694996467989d2d22361
+oid sha256:ac0c743dde6f816aca37108ca489d02bbe1068d0b38abb648e918dd356584553
-size 469008
+size 465060

librcc.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+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
+
+- download source tarball again, the former one did not match 
+
+-------------------------------------------------------------------
+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
 

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,17 +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
 Provides posibility to automaticaly convert considered encodings (a lot
@@ -47,6 +51,8 @@ library is part of rusxmms patch.
 %package -n %lname
 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
@@ -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 \
+    --enable-force-system-iconv 
-    --disable-gtk2
 make %{?_smp_mflags}
 
 %install