update to 0.2.12

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/librcc?expand=0&rev=13

baselibs.conf

@@ -1 +1,2 @@
 librcc0
+librccui0

libguess.c-64bit-portability.patch

@@ -1,16 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac0c743dde6f816aca37108ca489d02bbe1068d0b38abb648e918dd356584553
-size 465060

librcc-0.2.12.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:207973fbb73e1e376dad7542af17fe428efece91ea7f92a4efbcee676d2cb74b
+size 466527

librcc-0.2.9-czech_config.patch

@@ -1,16 +0,0 @@
-Author: Kyrill Detinov <lazy.kent.suse@gmail.com>
-Description: Fix Czech locale code in config file.
-
-Index: examples/rcc.xml
-===================================================================
---- examples/rcc.xml.orig	2009-08-27 23:57:37.000000000 +0400
-+++ examples/rcc.xml	2010-03-14 22:19:39.000000000 +0300
-@@ -38,7 +38,7 @@
- 		<Charset>ISO-IR-111</Charset>
- 	    </Charsets>
- 	</Language>
--	<Language name="cz">
-+	<Language name="cs">
- 	    <FullName locale="ru">Чешский</FullName>
- 	    <Charsets>
- 		<Charset>CP1250</Charset>

librcc.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat Dec  7 11:21:43 UTC 2013 - lazy.kent@opensuse.org
+
+- Update to 0.2.12.
+  * Remove librcd and enca from pkgconfig requires.
+  * Use cs for Czech language (cz is wrong).
+  * Language autodetection: prefer english over the languages
+    without any non-parent word (english is global parent).
+  * Support LibGuess 1.1.
+  * Fix build system for compatibility with latest versions of
+    automake.
+  * Fix complaining in example.
+  * Multiple fixes of build system.
+  * Compatibility with older automake and fixes to release script.
+  * Unversion generated files.
+- Drop "librcc-0.2.9-czech_config", "librcc-0.2.10-libguess",
+  "libguess.c-64bit-portability" patches (fixed upstream).
+- Merge librcc0 and rcc-runtime packages because they depends on
+  each other.
+
 -------------------------------------------------------------------
 Tue Oct 22 15:58:10 UTC 2013 - lazy.kent@opensuse.org
 

librcc.spec

@@ -17,8 +17,9 @@
 
 
 %define lname librcc0
+
 Name:           librcc
-Version:        0.2.10
+Version:        0.2.12
 Release:        0
 Summary:        Russian Charset Conversion Library
 License:        LGPL-2.1+
@@ -26,19 +27,13 @@ Group:          System/Libraries
 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
-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:  pkg-config
 BuildRequires:  pkgconfig(enca)
+BuildRequires:  pkgconfig(libguess)
+BuildRequires:  pkgconfig(librcd)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -50,7 +45,8 @@ library is part of rusxmms patch.
 %package -n %lname
 Summary:        Russian Charset Conversion Library
 Group:          System/Libraries
-Requires:       rcc-runtime = %{version}
+Provides:       rcc-runtime = %{version}
+Obsoletes:      rcc-runtime < 0.2.12
 Supplements:    packageand(unzip:aspell)
 
 %description -n %lname
@@ -66,21 +62,10 @@ Requires:       %{lname} = %{version}
 %description -n librcc-devel
 Development files for the package LibRCC.
 
-%package -n rcc-runtime
-Summary:        LibRCC Runtime Environment
-Group:          Productivity/Text/Convertors
-
-%description -n rcc-runtime
-Runtime environment for the package LibRCC.
-
 %prep
-%setup -qn %{name}-%{version}
+%setup -q
-%patch1
-%patch2 -p1
-%patch3 -p1
 
 %build
-./autogen.sh
 %configure \
     --disable-static \
     --enable-force-system-iconv
@@ -98,20 +83,17 @@ rm -rf %{_builddir}/librcc-%{version}/examples/{.deps,Makefile,*~}
 
 %files -n %lname
 %defattr(-,root,root,-)
+%doc COPYING
 %{_libdir}/librcc.so.*
 %{_libdir}/librccui.so.*
+%{_libdir}/rcc/
+%config(noreplace) %{_sysconfdir}/rcc.xml
 
 %files -n librcc-devel
 %defattr(-,root,root,-)
-%doc docs examples
+%doc AUTHORS ChangeLog COPYING NEWS README docs examples
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/%{name}.pc
 
-%files -n rcc-runtime
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/rcc/
-%config(noreplace) %{_sysconfdir}/rcc.xml
-
 %changelog