rpm/librcc
SHA256
1
0
Fork 0
forked from pool/librcc
Code Pull Requests Activity

Accepting request 215061 from devel:libraries:c_c++

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/215061
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librcc?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2014-02-03 05:49:09 +00:00 committed by Git OBS Bridge
commit bcf25b4ea8
7 changed files with 54 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libguess.c-64bit-portability.patch
View File

@ -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

68
librcc-0.2.10-libguess.patch
View File

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

3
librcc-0.2.10.tar.bz2
View File

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

3
librcc-0.2.12.tar.bz2 Normal file
View File

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

16
librcc-0.2.9-czech_config.patch
View File

@ -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>

30
librcc.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Fri Jan 17 14:40:54 UTC 2014 - lazy.kent@opensuse.org
- Correct baselibs.conf.
-------------------------------------------------------------------
Fri Jan 3 09:51:24 UTC 2014 - lazy.kent@opensuse.org
- Split off rcc-runtime subpackage.
-------------------------------------------------------------------
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

50
librcc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package librcc
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -16,9 +16,10 @@
#
%define lname librcc0
%define major 0
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
@ -47,40 +42,36 @@ Provides posibility to automaticaly convert considered encodings (a lot
of languages is supported, not only russian one) to/from UTF-8. The
library is part of rusxmms patch.
%package -n %lname
%package -n %{name}%{major}
Summary: Russian Charset Conversion Library
Group: System/Libraries
Requires: rcc-runtime = %{version}
Requires: rcc-runtime
Supplements: packageand(unzip:aspell)
%description -n %lname
%description -n %{name}%{major}
Provides posibility to automaticaly convert considered encodings (a lot
of languages is supported, not only russian one) to/from UTF-8. The
library is part of rusxmms patch.
%package -n librcc-devel
%package devel
Summary: Development Files for LibRCC
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
Requires: %{name}%{major} = %{version}
%description -n librcc-devel
%description devel
Development files for the package LibRCC.
%package -n rcc-runtime
Summary: LibRCC Runtime Environment
Group: Productivity/Text/Convertors
Group: System/Libraries
%description -n rcc-runtime
Runtime environment for the package LibRCC.
%prep
%setup -qn %{name}-%{version}
%patch1
%patch2 -p1
%patch3 -p1
%setup -q
%build
./autogen.sh
%configure \
--disable-static \
--enable-force-system-iconv
@ -90,20 +81,21 @@ make %{?_smp_mflags}
%make_install
install -Dm 0644 examples/rcc.xml %{buildroot}%{_sysconfdir}/rcc.xml
rm -f %{buildroot}%{_libdir}/{*.la,rcc/engines/*.la}
rm -rf %{_builddir}/librcc-%{version}/examples/{.deps,Makefile,*~}
rm -rf %{_builddir}/%{name}-%{version}/examples/{.deps,Makefile,*~}
%post -n %lname -p /sbin/ldconfig
%post -n %{name}%{major} -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%postun -n %{name}%{major} -p /sbin/ldconfig
%files -n %lname
%files -n %{name}%{major}
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/librcc.so.*
%{_libdir}/librccui.so.*
%files -n librcc-devel
%files devel
%defattr(-,root,root,-)
%doc docs examples
%doc AUTHORS ChangeLog COPYING NEWS README docs examples
%{_includedir}/*
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/%{name}.pc