diff --git a/libguess-1.1-libmowgli.h-path.patch b/libguess-1.1-libmowgli.h-path.patch new file mode 100644 index 0000000..4ea1c3b --- /dev/null +++ b/libguess-1.1-libmowgli.h-path.patch @@ -0,0 +1,13 @@ +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 ++#include + + #include "autoconf.h" + diff --git a/libguess.changes b/libguess.changes index 9d70460..3edd62a 100644 --- a/libguess.changes +++ b/libguess.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 24 23:46:46 UTC 2013 - i@marguerite.su + +- add patch: libguess-1.1-libmowgli.h-path.patch + * fix libmowgli/mowgli.h path +- OSI compatible license + ------------------------------------------------------------------- Wed May 9 12:37:41 UTC 2012 - chris@computersalat.de diff --git a/libguess.spec b/libguess.spec index 15e74fd..d767434 100644 --- a/libguess.spec +++ b/libguess.spec @@ -1,8 +1,7 @@ # # spec file for package libguess # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011 Scorpio IT, Deidesheim, 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 @@ -16,20 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define libsoname %{name}1 Name: libguess -%define libsoname %{name}1 -Summary: A high-speed character set detection library -License: Other -Group: System/Libraries Version: 1.1 Release: 0 +License: BSD-3-Clause +Summary: A high-speed character set detection library Url: http://www.atheme.org/project/libguess +Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# 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: pkg-config +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A high-speed character set detection library @@ -80,13 +81,17 @@ libguess library. %prep %setup -q +%patch1 -p1 %build %configure -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%makeinstall +%make_install + +# fatal error: "autoconf.h": No such file or directory in librcc build +cp -r src/libguess/autoconf.h %{buildroot}%{_includedir}/%{name}/ %post -n %{libsoname} -p /sbin/ldconfig %postun -n %{libsoname} -p /sbin/ldconfig @@ -101,6 +106,7 @@ libguess library. %{_libdir}/%{name}.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/%{name}.h +%{_includedir}/%{name}/autoconf.h %{_libdir}/pkgconfig/%{name}.pc %changelog