.gitignore

@@ -1,2 +1,2 @@
-SOURCES/libconfig-1.7.2.pdf
+SOURCES/libconfig-1.5.tar.gz
-SOURCES/libconfig-1.7.2.tar.gz
+SOURCES/libconfig.pdf

.libconfig.metadata

@@ -1,2 +1,2 @@
-0a844d17022a58df84d93d9fe4de90b1c9ffb197 SOURCES/libconfig-1.7.2.pdf
+24306c7efce07669a4053d0977a45e2f3a3add79 SOURCES/libconfig-1.5.tar.gz
-1da1e7f4e0e376582a8414d2be1acc9dbf6649b5 SOURCES/libconfig-1.7.2.tar.gz
+0a844d17022a58df84d93d9fe4de90b1c9ffb197 SOURCES/libconfig.pdf

SOURCES/generate-pdf.sh

@@ -1,30 +0,0 @@
-#! /bin/sh
-
-# This script builds the PDF version of the libconfig documentation.
-# Inspired by the PostgreSQL package.
-
-set -e
-
-# Pass package version and name optionally as argument
-VERSION=$1
-PKGNAME=${2-libconfig}
-
-test -z "$VERSION" && VERSION=`awk '/^Version:/ { print $2; }' "$PKGNAME".spec`
-
-TARGETFILE=`readlink -f "$PKGNAME-$VERSION.pdf"`
-test -f "$TARGETFILE" && echo "$TARGETFILE exists" && exit 1
-
-echo Building $TARGETFILE ...
-
-tar xf "$PKGNAME"-$VERSION.tar.*
-cd "$PKGNAME"-$VERSION
-
-# Apply any patches that affect the PDF documentation
-# patch -p1 < ../xxx.patch
-
-# Build the PDF docs
-./configure >/dev/null
-make pdf
-mv -f doc/libconfig.pdf "$TARGETFILE"
-
-exit 0

SPECS/libconfig.spec

@@ -1,21 +1,15 @@
-%bcond_without check
-
 Name:                   libconfig
 Summary:                C/C++ configuration file library
-Version:                1.7.2
+Version:                1.5
 Release:                9%{?dist}
 License:                LGPLv2+
+Group:                  System Environment/Libraries
+Source0:                http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz
+# Generated from libconfig 1.5 on Fedora 23 x86_64 (2015-12-17)
+Source1:		libconfig.pdf
 URL:                    http://www.hyperrealm.com/libconfig/
-Source0:                https://hyperrealm.github.io/%name/dist/%name-%version.tar.gz
+BuildRequires:          texinfo-tex, tex(ecbx1095.tfm), tex(ecrm1095.tfm), tex(cm-super-t1.enc)
-# Generated from libconfig 1.7.2 on Fedora 28 x86_64 (2018-07-18)
+BuildRequires:		bison, flex
-Source1:                libconfig-%version.pdf
-# Helper script to generate Source1 (locally)
-Source2:                generate-pdf.sh
-
-BuildRequires:          gcc, gcc-c++
-BuildRequires:          texinfo
-BuildRequires:          bison, flex
-BuildRequires: make
 
 %description
 Libconfig is a simple library for manipulating structured configuration
@@ -23,102 +17,61 @@ files. This file format 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.
 
-
 %package devel
 Summary:                Development files for libconfig
-Requires:               %{name}%{?_isa} = %{version}-%{release}
+Group:                  Development/Libraries
+Requires:               %{name} = %{version}-%{release}
+Requires:               pkgconfig
+Requires(post):         /sbin/install-info
+Requires(preun):        /sbin/install-info
 
 %description devel
 Development libraries and headers for developing software against
 libconfig.
 
-
 %prep
 %setup -q
 iconv -f iso-8859-1 -t utf-8 -o AUTHORS{.utf8,}
 mv AUTHORS{.utf8,}
 
-
 %build
-%configure \
+%configure --disable-static
-  --disable-silent-rules \
-  --disable-static
-
 make %{?_smp_mflags}
-
+make pdf
 
 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
+# Need to use a pre-built copy to support multilib
+rm -rf doc/libconfig.pdf
 install -p %{SOURCE1} doc/
 
-
-%if %{with check}
 %check
-make check
+./tests/libconfig_tests
-%endif
-
 
 %ldconfig_scriptlets
 
-%files
+%post devel
-%license COPYING.LIB
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-%doc AUTHORS ChangeLog README
-%{_libdir}/libconfig*.so.11*
 
+%preun devel
+if [ $1 = 0 ]; then
+   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+%files
+%doc AUTHORS ChangeLog COPYING.LIB README
+%{_libdir}/libconfig*.so.*
 
 %files devel
-%doc doc/libconfig-%version.pdf
+%doc doc/libconfig.pdf
 %{_includedir}/libconfig*
-%{_libdir}/cmake/%{name}
-%{_libdir}/cmake/%{name}++
 %{_libdir}/libconfig*.so
 %{_libdir}/pkgconfig/libconfig*.pc
 %{_infodir}/libconfig.info*
 
-
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-9
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.2-8
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.7.2-2
-- %%files: track library sonames, so bumps aren't a surprise
-- %%build: --disable-silent-rules
-- -devel: tighten subpkg dep with %%_isa, drop hard-coded pkgconfig dep
-- use %%make_build %%make_install %%ldconfig_scriptlets
-
-* Mon Jul 23 2018 Pavel Raiskup <praiskup@redhat.com> - 1.7.2-1
-- new upstream release (rhbz#1602423)
-
-* Mon Jul 23 2018 Pavel Raiskup <praiskup@redhat.com> - 1.5-12
-- cleanup
-
-* Sun Jul 22 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.5-11
-- Add missing gcc-c++ dep, spec cleanups
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild