From facdf55da09948ba9f38a39b57baf099073040bc Mon Sep 17 00:00:00 2001 From: Robbie Harwood (frozencemetery) Date: Aug 26 2015 19:34:28 +0000 Subject: Merge most changes from the upstream spec file --- diff --git a/ding-libs.spec b/ding-libs.spec index 133d1f9..ca1e5d4 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -1,6 +1,6 @@ Name: ding-libs Version: 0.5.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: "Ding is not GLib" assorted utility libraries Group: Development/Libraries License: LGPLv3+ @@ -37,6 +37,7 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: m4 BuildRequires: doxygen +BuildRequires: pkgconfig BuildRequires: check-devel %description @@ -87,10 +88,12 @@ Utility functions to manipulate filesystem pathnames %postun -n libpath_utils -p /sbin/ldconfig %files -n libpath_utils +%defattr(-,root,root,-) %doc COPYING COPYING.LESSER %{_libdir}/libpath_utils.so.* %files -n libpath_utils-devel +%defattr(-,root,root,-) %{_includedir}/path_utils.h %{_libdir}/libpath_utils.so %{_libdir}/pkgconfig/path_utils.pc @@ -127,15 +130,17 @@ time properties %postun -n libdhash -p /sbin/ldconfig %files -n libdhash +%defattr(-,root,root,-) %doc COPYING COPYING.LESSER %{_libdir}/libdhash.so.* %files -n libdhash-devel +%defattr(-,root,root,-) %{_includedir}/dhash.h %{_libdir}/libdhash.so %{_libdir}/pkgconfig/dhash.pc %doc dhash/README.dhash -%doc dhash/examples/ +%doc dhash/examples/*.c ############################################################################## @@ -167,11 +172,13 @@ and serialization %files -n libcollection +%defattr(-,root,root,-) %doc COPYING %doc COPYING.LESSER %{_libdir}/libcollection.so.* %files -n libcollection-devel +%defattr(-,root,root,-) %{_includedir}/collection.h %{_includedir}/collection_tools.h %{_includedir}/collection_queue.h @@ -208,11 +215,13 @@ A dynamically-growing, reference-counted array %postun -n libref_array -p /sbin/ldconfig %files -n libref_array +%defattr(-,root,root,-) %doc COPYING %doc COPYING.LESSER %{_libdir}/libref_array.so.* %files -n libref_array-devel +%defattr(-,root,root,-) %{_includedir}/ref_array.h %{_libdir}/libref_array.so %{_libdir}/pkgconfig/ref_array.pc @@ -247,11 +256,13 @@ Basic object types %postun -n libbasicobjects -p /sbin/ldconfig %files -n libbasicobjects +%defattr(-,root,root,-) %doc COPYING %doc COPYING.LESSER %{_libdir}/libbasicobjects.so.* %files -n libbasicobjects-devel +%defattr(-,root,root,-) %{_includedir}/simplebuffer.h %{_libdir}/libbasicobjects.so %{_libdir}/pkgconfig/basicobjects.pc @@ -288,16 +299,18 @@ structure %postun -n libini_config -p /sbin/ldconfig %files -n libini_config +%defattr(-,root,root,-) %doc COPYING %doc COPYING.LESSER %{_libdir}/libini_config.so.* %files -n libini_config-devel +%defattr(-,root,root,-) %{_includedir}/ini_config.h -%{_includedir}/ini_comment.h -%{_includedir}/ini_configmod.h %{_includedir}/ini_configobj.h %{_includedir}/ini_valueobj.h +%{_includedir}/ini_comment.h +%{_includedir}/ini_configmod.h %{_libdir}/libini_config.so %{_libdir}/pkgconfig/ini_config.pc %doc ini/doc/html/ @@ -337,7 +350,13 @@ rm -f \ # Remove document install script. RPM is handling this rm -f */doc/html/installdox +%clean +rm -rf $RPM_BUILD_ROOT + %changelog +* Wed Aug 26 2015 Robbie Harwood - 0.5.0-27 +- Merge most changes from the upstream spec file + * Wed Aug 26 2015 Robbie Harwood - 0.5.0-26 - New upstream release 0.5.0 - https://fedorahosted.org/sssd/wiki/Releases/DingNotes-0.5.0