From 7ac54c0a43416adb01c58f07c7dfc1d36e79443b5180aff4abea30600d14e8bd Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 19 May 2012 12:14:59 +0000 Subject: [PATCH 1/2] Accepting request 121513 from home:plater Added baselibs.conf for 32 bit compat libs, moved info files to devel package and disabled doc package with html and pdf as workaround for broken texlive-bin build OBS-URL: https://build.opensuse.org/request/show/121513 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libconfig?expand=0&rev=8 --- baselibs.conf | 2 ++ libconfig.changes | 6 +++--- libconfig.spec | 45 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..eaa376a --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,2 @@ +libconfig++9 +libconfig9 diff --git a/libconfig.changes b/libconfig.changes index ccc3a07..4eeabc5 100644 --- a/libconfig.changes +++ b/libconfig.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Wed Mar 14 14:30:46 UTC 2012 - saschpe@suse.de +Sat May 19 11:25:58 UTC 2012 - davejplater@gmail.com -- Fix typo, it's %{_smp_mflags} -- Remove unwanted description paragraphs +- Added baselibs.conf for 32 bit ffado +- Disabled pdf and html docs, moved info to devel package ------------------------------------------------------------------- Mon Mar 12 08:39:37 UTC 2012 - saschpe@suse.de diff --git a/libconfig.spec b/libconfig.spec index 03b88bc..1e66996 100644 --- a/libconfig.spec +++ b/libconfig.spec @@ -16,6 +16,9 @@ # +# +%define docbuild 0 + Name: libconfig Version: 1.4.8 Release: 0 @@ -24,17 +27,20 @@ Summary: A simple library for manipulating structured configuration files License: LGPL-2.1+ Group: System/Libraries Url: http://www.hyperrealm.com/main.php?s=libconfig -Source: http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz +Source0: http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz +Source1: baselibs.conf BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: pkg-config +%if 0%{?docbuild} == 1 BuildRequires: texinfo BuildRequires: texlive BuildRequires: texlive-latex -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): info +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libconfig is a simple library for manipulating structured @@ -43,6 +49,16 @@ is more compact and more readable than XML. And unlike XML, it is type-aware, so it is not necessary to do string parsing in application code. +Libconfig is very compact — just 38K for the stripped C shared +library (less than one-fourth the size of the expat XML parser +library) and 66K for the stripped C++ shared library. This makes +it well-suited for memory-constrained systems like handheld +devices. + +The library includes bindings for both the C and C++ languages. +It works on POSIX-compliant UNIX systems (GNU/Linux, Mac OS X, +Solaris, FreeBSD) and Windows (2000, XP and later). + %package -n libconfig%{_soversion} Summary: Shared libraries for libconfig Group: System/Libraries @@ -85,6 +101,7 @@ application code. This package contains the shared libraries for libconfig. %package -n libconfig++-devel + Summary: C++-Bindings development files for libconfig Group: Development/Languages/C and C++ Requires: libconfig++%{_soversion} = %{version} @@ -100,21 +117,25 @@ application code. This package contains the C++-bindings development files. +%if 0%{?docbuild} == 1 %package doc Summary: Documentation files for libconfig Group: Documentation/Other %description doc Documentation files for package libconfig. +%endif %prep %setup -q %build %configure -make %{?_smp_mflags} -make pdf +make %{?_smp_flags} +%if 0%{?docbuild} == 1 make html +make pdf +%endif %install %make_install @@ -134,16 +155,11 @@ rm %{buildroot}%{_libdir}/*.{l,}a %postun -n libconfig++%{_soversion} -p /sbin/ldconfig -%post doc -%install_info --info-dir=%{_infodir} %{_infodir}/libconfig.info.gz - -%postun doc -%install_info_delete --info-dir=%{_infodir} %{_infodir}/libconfig.info.gz - +%if 0%{?docbuild} == 1 %files doc %defattr(-,root,root) %doc doc/*.html doc/*.pdf examples -%{_infodir}/libconfig.info.gz +%endif %files -n libconfig%{_soversion} %defattr(-,root,root) @@ -162,11 +178,18 @@ rm %{buildroot}%{_libdir}/*.{l,}a %{_libdir}/libconfig.so %{_libdir}/pkgconfig/libconfig.pc +%post -n libconfig++-devel +%install_info --info-dir=%{_infodir} %{_infodir}/libconfig.info.gz + +%postun -n libconfig++-devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/libconfig.info.gz + %files -n libconfig++-devel %defattr(-,root,root) %doc ChangeLog TODO %{_includedir}/libconfig.h++ %{_libdir}/libconfig++.so %{_libdir}/pkgconfig/libconfig++.pc +%{_infodir}/libconfig.info.gz %changelog From c9a425ea1eca7672a7d834c9a75509c302f6e6d2342cec730907ad78a87837b8 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 19 May 2012 12:20:37 +0000 Subject: [PATCH 2/2] Accepting request 121515 from home:plater Added baselibs.conf for 32 bit compat libs, moved info files to devel package and disabled doc package with html and pdf as workaround for broken texlive-bin build See packaging list message about Broken dependencies in factory "can't install ffado: nothing provides libconfig++.so.9 needed by libffado2-32bit Plus fixed overwritten changes OBS-URL: https://build.opensuse.org/request/show/121515 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libconfig?expand=0&rev=9 --- libconfig.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libconfig.changes b/libconfig.changes index 4eeabc5..f9c7790 100644 --- a/libconfig.changes +++ b/libconfig.changes @@ -4,6 +4,12 @@ Sat May 19 11:25:58 UTC 2012 - davejplater@gmail.com - Added baselibs.conf for 32 bit ffado - Disabled pdf and html docs, moved info to devel package +------------------------------------------------------------------- +Wed Mar 14 14:30:46 UTC 2012 - saschpe@suse.de + +- Fix typo, it's %{_smp_mflags} +- Remove unwanted description paragraphs + ------------------------------------------------------------------- Mon Mar 12 08:39:37 UTC 2012 - saschpe@suse.de