[packages/liblangtag] - updated to 0.5.1 - removed obsolete Fix-build-issues-with-MSVC,Werror patches - build gobject inte
qboosh
qboosh at pld-linux.org
Fri Jun 7 18:24:12 CEST 2013
commit a278ab14588cfdd7c7d75784c892821723cea7cb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jun 7 18:24:02 2013 +0200
- updated to 0.5.1
- removed obsolete Fix-build-issues-with-MSVC,Werror patches
- build gobject interface
0001-Fix-build-issues-with-MSVC.patch | 28 ---------
liblangtag-Werror.patch | 31 ----------
liblangtag.spec | 104 ++++++++++++++++++++++++++++++----
3 files changed, 93 insertions(+), 70 deletions(-)
---
diff --git a/liblangtag.spec b/liblangtag.spec
index b7951b0..adc5fdd 100644
--- a/liblangtag.spec
+++ b/liblangtag.spec
@@ -1,22 +1,21 @@
#
# Conditional build:
%bcond_without static_libs # static library build
+%bcond_without introspection # GObject interface
%bcond_without tests # "make check" call
#
Summary: An interface library to access tags for identifying languages
Summary(pl.UTF-8): Biblioteka interfejsu dostępu do znaczników identyfikujących języki
Name: liblangtag
-Version: 0.4.0
+Version: 0.5.1
Release: 1
License: LGPL v3+
Group: Libraries
Source0: https://bitbucket.org/tagoh/liblangtag/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 54e578c91b1b68e69c72be22adcb2195
-Patch0: 0001-Fix-build-issues-with-MSVC.patch
-Patch1: %{name}-Werror.patch
+# Source0-md5: 36271d3fa0d9dec1632029b6d7aac925
URL: http://tagoh.bitbucket.org/liblangtag/
%{?with_tests:BuildRequires: check-devel >= 0.9.4}
-BuildRequires: glib2-devel >= 2.0
+%{?with_introspection:BuildRequires: glib2-devel >= 2.0}
BuildRequires: gobject-introspection-devel >= 1.30.0
BuildRequires: gtk-doc >= 1.0
BuildRequires: libxml2-devel >= 2.1.0
@@ -88,22 +87,56 @@ Static liblangtag library.
%description static -l pl.UTF-8
Statyczna biblioteka liblangtag.
+%package gobject
+Summary: GObject based interface to liblangtag
+Summary(pl.UTF-8): Interfejs GObject do biblioteki liblangtag
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gobject
+GObject based interface to liblangtag.
+
+%description gobject -l pl.UTF-8
+Interfejs GObject do biblioteki liblangtag.
+
+%package gobject-devel
+Summary: Header files for liblangtag-gobject library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki liblangtag-gobject
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gobject = %{version}-%{release}
+Requires: glib2-devel >= 2.0
+
+%description gobject-devel
+Header files for liblangtag-gobject library.
+
+%description gobject-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki liblangtag-gobject.
+
+%package gobject-static
+Summary: Static liblangtag-gobject library
+Summary(pl.UTF-8): Statyczna biblioteka liblangtag-gobject
+Group: Development/Libraries
+Requires: %{name}-gobject-devel = %{version}-%{release}
+
+%description gobject-static
+Static liblangtag-gobject library.
+
+%description gobject-static -l pl.UTF-8
+Statyczna biblioteka liblangtag-gobject.
+
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
-# NOTE: introspection build is broken as of 0.4.0
%configure \
- --disable-introspection \
+ %{!?with_introspection:--disable-introspection} \
--disable-silent-rules \
%{!?with_static_libs:--disable-static} \
%{!?with_tests:--disable-test} \
--with-html-dir=%{_gtkdocdir}
%{__make}
-# LD_LIBRARY_PATH=`pwd`/liblangtag/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
%{?with_tests:%{__make} check}
@@ -122,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%post gobject -p /sbin/ldconfig
+%postun gobject -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
@@ -135,7 +171,32 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblangtag.so
-%{_includedir}/liblangtag
+%dir %{_includedir}/liblangtag
+%{_includedir}/liblangtag/langtag.h
+%{_includedir}/liblangtag/lt-database.h
+%{_includedir}/liblangtag/lt-error.h
+%{_includedir}/liblangtag/lt-ext-module.h
+%{_includedir}/liblangtag/lt-ext-module-data.h
+%{_includedir}/liblangtag/lt-extension.h
+%{_includedir}/liblangtag/lt-extlang-db.h
+%{_includedir}/liblangtag/lt-extlang.h
+%{_includedir}/liblangtag/lt-grandfathered.h
+%{_includedir}/liblangtag/lt-grandfathered-db.h
+%{_includedir}/liblangtag/lt-iter.h
+%{_includedir}/liblangtag/lt-lang.h
+%{_includedir}/liblangtag/lt-lang-db.h
+%{_includedir}/liblangtag/lt-list.h
+%{_includedir}/liblangtag/lt-macros.h
+%{_includedir}/liblangtag/lt-redundant.h
+%{_includedir}/liblangtag/lt-redundant-db.h
+%{_includedir}/liblangtag/lt-region.h
+%{_includedir}/liblangtag/lt-region-db.h
+%{_includedir}/liblangtag/lt-script.h
+%{_includedir}/liblangtag/lt-script-db.h
+%{_includedir}/liblangtag/lt-string.h
+%{_includedir}/liblangtag/lt-tag.h
+%{_includedir}/liblangtag/lt-variant.h
+%{_includedir}/liblangtag/lt-variant-db.h
%{_pkgconfigdir}/liblangtag.pc
%{_gtkdocdir}/liblangtag
@@ -144,3 +205,24 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/liblangtag.a
%endif
+
+%if %{with introspection}
+%files gobject
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liblangtag-gobject.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblangtag-gobject.so.0
+%{_libdir}/girepository-1.0/LangTag-0.5.typelib
+
+%files gobject-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liblangtag-gobject.so
+%{_includedir}/liblangtag/lt-gobject.h
+%{_datadir}/gir-1.0/LangTag-0.5.gir
+%{_pkgconfigdir}/liblangtag-gobject.pc
+
+%if %{with static_libs}
+%files gobject-static
+%defattr(644,root,root,755)
+%{_libdir}/liblangtag-gobject.a
+%endif
+%endif
diff --git a/0001-Fix-build-issues-with-MSVC.patch b/0001-Fix-build-issues-with-MSVC.patch
deleted file mode 100644
index 61834cc..0000000
--- a/0001-Fix-build-issues-with-MSVC.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 89108f5856b455640e288e2ce29d8c5904c12a3b Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira at tagoh.org>
-Date: Sun, 25 Nov 2012 17:49:56 +0900
-Subject: [PATCH] Fix build issues with MSVC
-
----
- configure.ac | 12 +++++++++++-
- data/Makefile.am | 9 ++++++++-
- liblangtag/lt-ext-module.c | 6 +++++-
- liblangtag/lt-macros.h | 11 +++++++++++
- liblangtag/lt-messages.h | 7 +++++++
- 5 files changed, 42 insertions(+), 3 deletions(-)
-
-diff --git a/liblangtag/lt-macros.h b/liblangtag/lt-macros.h
-index a7dfcc2..6ff22c9 100644
---- a/liblangtag/lt-macros.h
-+++ b/liblangtag/lt-macros.h
-@@ -200,6 +202,7 @@
- # define LT_BREAKPOINT() \
- LT_STMT_START {__asm__ __volatile__ ("bpt");} LT_STMT_END
- #else
-+#include <signal.h>
- # define LT_BREAKPOINT() \
- LT_STMT_START {raise(SIGTRAP);} LT_STMT_END
- #endif
---
-1.8.0
-
diff --git a/liblangtag-Werror.patch b/liblangtag-Werror.patch
deleted file mode 100644
index 529b307..0000000
--- a/liblangtag-Werror.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- liblangtag-0.4.0/liblangtag/lt-ext-module.c~ 2012-10-16 04:48:31.000000000 +0200
-+++ liblangtag-0.4.0/liblangtag/lt-ext-module.c 2013-02-14 11:35:35.138119334 +0100
-@@ -258,7 +258,7 @@
- (lt_destroy_func_t)dlclose);
- func = dlsym(module->module, "module_get_version");
- if (!func) {
-- lt_warning(dlerror());
-+ lt_warning("%s", dlerror());
- break;
- }
- if (((lt_ext_module_version_func_t)func)() != LT_EXT_MODULE_VERSION) {
-@@ -268,7 +268,7 @@
- }
- func = dlsym(module->module, "module_get_funcs");
- if (!func) {
-- lt_warning(dlerror());
-+ lt_warning("%s", dlerror());
- break;
- }
- if (!(module->funcs = ((lt_ext_module_get_funcs_func_t)func)())) {
---- liblangtag-0.4.0/tests/main.c~ 2012-10-09 11:44:06.000000000 +0200
-+++ liblangtag-0.4.0/tests/main.c 2013-02-14 11:36:53.860009569 +0100
-@@ -37,7 +37,7 @@
- const char *message,
- lt_pointer_t user_data)
- {
-- lt_error_set(&error, type, message);
-+ lt_error_set(&error, type, "%s", message);
- }
-
- static void
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/liblangtag.git/commitdiff/a278ab14588cfdd7c7d75784c892821723cea7cb
More information about the pld-cvs-commit
mailing list