Accepting request 285102 from home:XRevan86

OBS-URL: https://build.opensuse.org/request/show/285102
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libguess?expand=0&rev=6

libguess-1.1-libmowgli.h-path.patch

@@ -1,13 +0,0 @@
-Index: libguess-1.1/src/libguess/libguess.h
-===================================================================
---- libguess-1.1.orig/src/libguess/libguess.h
-+++ libguess-1.1/src/libguess/libguess.h
-@@ -44,7 +44,7 @@
- /* prototypes */
- #ifdef LIBGUESS_CORE
- 
--#include <mowgli.h>
-+#include <libmowgli/mowgli.h>
- 
- #include "autoconf.h"
- 

libguess-1.1.tar.bz2

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

libguess.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Feb  9 13:20:33 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 1.2:
+  * Remove mowgli dependency, deprecate libguess_init().
+  * Remove broken links to jira.atheme.org.
+  * Expose libguess_init().
+  * Define m4 macro directory in configure.ac.
+  * Switch to libmowgli-2.
+- Remove libguess-1.1-libmowgli.h-path.patch: fixed upstream.
+- Make description shorter.
+
 -------------------------------------------------------------------
 Mon Jun 24 23:46:46 UTC 2013 - i@marguerite.su
 
@@ -20,4 +32,3 @@ Tue Jan 31 17:11:16 UTC 2012 - jengelh@medozas.de
 Sat Jul 30 23:17:34 UTC 2011 - chris@computersalat.de
 
 - initial pkg 1.0
-

libguess.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libguess
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,47 +15,30 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define		libsoname	%{name}1
 
+%define libsoname %{name}1
 Name:           libguess
-Version:        1.1
+Version:        1.2
 Release:        0
-License:        BSD-3-Clause
 Summary:        A high-speed character set detection library
-Url:            http://www.atheme.org/project/libguess
+License:        BSD-3-Clause
 Group:          System/Libraries
-Source0:        %{name}-%{version}.tar.bz2
+Url:            https://github.com/kaniini/libguess
+Source:         http://rabbit.dereferenced.org/~nenolod/distfiles/%{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix libmowgli/mowgli.h path
-Patch1:         libguess-1.1-libmowgli.h-path.patch
-BuildRequires:  libmowgli-devel >= 0.7.0
+BuildRequires:  libmowgli2-devel >= 2.0.0
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-A high-speed character set detection library
+libguess employs discrete-finite automata to deduce the character
+set of the input buffer. The advantage of this is that all
+character sets can be checked in parallel, and quickly. Right now,
+libguess passes a byte to each DFA on the same pass, meaning that
+the winning character set can be deduced as efficiently as possible.
 
-libguess has two functions:
-
-libguess_determine_encoding(const char *inbuf, int length, const char *region);
-This detects a character set. Returns an appropriate charset name that can be
-passed to iconv_open(). Region is the name of the language or region that the
-data is related to, e.g. 'Baltic' for the Baltic states, or 'Japanese' for
-Japan.
-
-libguess_validate_utf8(const char *inbuf, int length);
-This employs libguess's DFA-based character set validation rules to ensure that
-a string is pure UTF-8. GLib's UTF-8 validation functions are broken, for
-example.
-
-Just include libguess.h and link to libguess to get these functions in your
-program. For your convenience, a pkg-config file is also supplied.
-libguess employs discrete-finite automata to deduce the character set of the
-input buffer. The advantage of this is that all character sets can be checked
-in parallel, and quickly. Right now, libguess passes a byte to each DFA on the
-same pass, meaning that the winning character set can be deduced as efficiently
-as possible.
-libguess is fully reentrant, using only local stack memory for DFA operations.
+libguess is fully reentrant, using only local stack memory for DFA
+operations.
 
 %package -n %{libsoname}
 Summary:        Shared library for libguess
@@ -70,7 +53,7 @@ This package contains the shared libguess library.
 Summary:        Development package for libguess
 Group:          Development/Libraries/C and C++
 Requires:       %{libsoname} = %{version}
-Requires:       libmowgli-devel
+Requires:       libmowgli2-devel >= 2.0.0
 Requires:       pkg-config
 
 %description devel
@@ -81,7 +64,6 @@ libguess library.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %configure
@@ -90,10 +72,11 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-# fatal error: "autoconf.h": No such file or directory in librcc build
-cp -r src/libguess/autoconf.h %{buildroot}%{_includedir}/%{name}/
+# Fatal error: "autoconf.h": No such file or directory in librcc build.
+install -Dm 0644 src/%{name}/autoconf.h %{buildroot}%{_includedir}/%{name}/autoconf.h
+
+%post -n %{libsoname} -p /sbin/ldconfig
 
-%post   -n %{libsoname} -p /sbin/ldconfig
 %postun -n %{libsoname} -p /sbin/ldconfig
 
 %files -n %{libsoname}
@@ -104,9 +87,7 @@ cp -r src/libguess/autoconf.h %{buildroot}%{_includedir}/%{name}/
 %defattr(-,root,root)
 %doc COPYING README
 %{_libdir}/%{name}.so
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/%{name}.h
-%{_includedir}/%{name}/autoconf.h
+%{_includedir}/%{name}/
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog