Accepting request 510069 from multimedia:libs

1

OBS-URL: https://build.opensuse.org/request/show/510069
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libconfig?expand=0&rev=10

baselibs.conf

@@ -1,2 +1,2 @@
-libconfig++9
+libconfig++8
-libconfig9
+libconfig8

libconfig-1.5.tar.gz

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

libconfig-1.6.tar.gz

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

libconfig.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Jul 13 09:42:53 UTC 2017 - tchvatal@suse.com
+
+- Update to 1.6.0:
+  * Added include_dir feature (support for Debian-style conf.d/
+    includes) (pull request #36)
+  * Added octal_ints feature (support for integer expressed in octal,
+    useful for permissions and masks in UNIX-like systems (pull req #42)
+  * Fixed "Removing a setting removes all siblings" (issue #41)
+    Props random85
+  * Allow specifying the number of decimals wanted when outputting
+    Based upon a suggestion by zhaopingsun (issue #31)
+  * Make libconfig usable from CMake (pull request/issue #28)
+    Props thfi
+  * Documentation fixes
+    - Copyright and examples
+    - Included TeX patch from Debian (fixes FTBS with TeXlive)
+  * Resync Debian packaging
+    includes updated packages for GCC5 transition
+
 -------------------------------------------------------------------
 Sun Jun  7 06:04:07 UTC 2015 - i@marguerite.su
 

libconfig.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libconfig
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,29 +16,25 @@
 #
 
 
-%define docbuild 0
+%define _soversion 8
-%define _soversion 9
 Name:           libconfig
-Version:        1.5
+Version:        1.6
 Release:        0
 Summary:        A simple library for manipulating structured configuration files
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Url:            http://www.hyperrealm.com/libconfig
+Url:            https://github.com/hyperrealm/libconfig
-Source0:        http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz
+Source0:        https://github.com/hyperrealm/libconfig/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
-BuildRequires:  pkg-config
+BuildRequires:  libtool
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  makeinfo
-%if 0%{?docbuild} == 1
+BuildRequires:  pkgconfig
-BuildRequires:  texinfo
-BuildRequires:  texlive
-BuildRequires:  texlive-latex
-Requires(pre):  info
-%endif
 
 %description
 Libconfig is a simple library for manipulating structured
@@ -114,82 +110,64 @@ application code.
 
 This package contains the C++-bindings development files.
 
-%if 0%{?docbuild} == 1
-%package doc
-Summary:        Documentation files for libconfig
-Group:          Documentation/Other
-%if 0%{?suse_version} >= 1130
-BuildArch:      noarch
-%endif
-
-%description doc
-Documentation files for package libconfig.
-%endif
-
 %prep
 %setup -q
 
+# remove autogenerated files
+pushd lib > /dev/null
+rm scanner.c scanner.h grammar.c grammar.h
+popd > /dev/null
+
 %build
-%configure
+autoreconf -fvi
-make %{?_smp_mflags}
+%configure \
-%if 0%{?docbuild} == 1
+  --disable-silent-rules \
-make %{?_smp_mflags} html
+  --disable-static
-make %{?_smp_mflags} pdf
+make -j1
-%endif
 
 %install
 %make_install
-# clean up
+find %{buildroot} -type f -name "*.la" -delete -print
-pushd examples
+%fdupes -s %{buildroot}%{_docdir}
-    make clean
+
-    find . -name '*.vcproj' -o -name '.deps' -exec rm -Rf '{}' '+'
+%check
-popd
+./tests/libconfig_tests
-rm %{buildroot}%{_libdir}/*.{l,}a
-%fdupes -s examples %{buildroot}%{_docdir}
 
 %post -n libconfig%{_soversion} -p /sbin/ldconfig
-
 %postun -n libconfig%{_soversion} -p /sbin/ldconfig
-
 %post -n libconfig++%{_soversion} -p /sbin/ldconfig
-
 %postun -n libconfig++%{_soversion} -p /sbin/ldconfig
 
-%if 0%{?docbuild} == 1
-%files doc
-%defattr(-,root,root)
-%doc doc/*.html doc/*.pdf examples
-%endif
-
 %files -n libconfig%{_soversion}
-%defattr(-,root,root)
 %doc AUTHORS COPYING* README
 %{_libdir}/libconfig.so.*
 
 %files -n libconfig++%{_soversion}
-%defattr(-,root,root)
 %doc AUTHORS COPYING* README
 %{_libdir}/libconfig++.so.*
 
 %files devel
-%defattr(-,root,root)
 %doc ChangeLog TODO
 %{_includedir}/libconfig.h
 %{_libdir}/libconfig.so
 %{_libdir}/pkgconfig/libconfig.pc
 
 %post -n libconfig++-devel
-%install_info --info-dir=%{_infodir} %{_infodir}/libconfig.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/libconfig.info%{ext_info}
 
 %postun -n libconfig++-devel
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/libconfig.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/libconfig.info%{ext_info}
 
 %files -n libconfig++-devel
-%defattr(-,root,root)
 %doc ChangeLog TODO
 %{_includedir}/libconfig.h++
 %{_libdir}/libconfig++.so
 %{_libdir}/pkgconfig/libconfig++.pc
-%{_infodir}/libconfig.info.gz
+%{_infodir}/libconfig.info%{ext_info}
+%dir %{_libdir}/cmake
+%dir %{_libdir}/cmake/libconfig
+%dir %{_libdir}/cmake/libconfig++
+%{_libdir}/cmake/libconfig++/libconfig++Config.cmake
+%{_libdir}/cmake/libconfig/libconfigConfig.cmake
 
 %changelog