diff --git a/.gitignore b/.gitignore index 085cda6..1a08e85 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libconfig-1.4.5.tar.gz +/libconfig-1.4.6.tar.gz diff --git a/libconfig.spec b/libconfig.spec index d96b9bf..98a4013 100644 --- a/libconfig.spec +++ b/libconfig.spec @@ -1,30 +1,30 @@ -Name: libconfig -Summary: C/C++ configuration file library -Version: 1.4.5 -Release: 2%{?dist} -License: LGPLv2+ -Group: System Environment/Libraries -Source0: http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz -URL: http://www.hyperrealm.com/libconfig/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: texinfo-tex +Name: libconfig +Summary: C/C++ configuration file library +Version: 1.4.6 +Release: 1%{?dist} +License: LGPLv2+ +Group: System Environment/Libraries +Source0: http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz +URL: http://www.hyperrealm.com/libconfig/ +BuildRequires: texinfo-tex +BuildRequires: chrpath %description -Libconfig is a simple library for manipulating structured configuration -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 +Libconfig is a simple library for manipulating structured configuration +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 -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Summary: Development files for libconfig +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 +Development libraries and headers for developing software against libconfig. %prep @@ -38,7 +38,6 @@ make %{?_smp_mflags} make pdf %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install-pdf rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT%{_infodir}/dir @@ -47,8 +46,8 @@ sed -i '/^\/CreationDate/d' $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/libconfig.p sed -i '/^\/ModDate/d' $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/libconfig.pdf sed -i '/^\/ID /d' $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/libconfig.pdf -%clean -rm -rf $RPM_BUILD_ROOT +# --disable-rpath doesn't work +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}_tests %post -p /sbin/ldconfig @@ -59,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT %preun devel if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files @@ -67,8 +66,10 @@ fi %doc AUTHORS ChangeLog COPYING.LIB README %{_libdir}/libconfig*.so.* + %files devel %defattr(-,root,root,-) +%{_bindir}/libconfig_tests %{_includedir}/libconfig* %{_libdir}/libconfig*.so %{_libdir}/pkgconfig/libconfig*.pc @@ -76,6 +77,11 @@ fi %{_infodir}/libconfig.info* %changelog +* Tue Mar 1 2011 Stanislav Ochotnicky - 1.4.6-1 +- Update to 1.4.6 +- Install libconfig_tests +- Fix rpmlint warnings + * Mon Feb 07 2011 Fedora Release Engineering - 1.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index b34a5b2..ae5df2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2219e1b2501e7296a7d3e971c63666a libconfig-1.4.5.tar.gz +f83d20588941e9b306fbcbb6e9630aac libconfig-1.4.6.tar.gz