diff --git a/json-c.spec b/json-c.spec index f8e3a0a..f98c66b 100644 --- a/json-c.spec +++ b/json-c.spec @@ -1,15 +1,30 @@ -%global reldate 20171207 +%global so_ver 3 + +# Uncomment when building a bootstrap for a bumped so-name. +# You also need to adjust the parameters below. +%global bootstrap 1 + +%if 0%{?bootstrap} +%global reldate_old 20160607 +%global version_old 0.12.1 +%global so_ver_old 2 +%endif + +%global reldate 20171207 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: json-c Version: 0.13 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: JSON implementation in C License: MIT URL: https://github.com/%{name}/%{name} -Source0: %{url}/archive/json-c-%{version}-%{reldate}.tar.gz +Source0: %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz +%if 0%{?bootstrap} +Source1: %{url}/archive/%{name}-%{version_old}-%{reldate_old}.tar.gz +%endif BuildRequires: autoconf BuildRequires: automake @@ -41,11 +56,11 @@ BuildRequires: doxygen BuildRequires: hardlink %description doc -This package contains the reference manual for json-c. +This package contains the reference manual for %{name}. %prep -%autosetup -n %{name}-%{name}-%{version}-%{reldate} -p 1 +%autosetup -Tb 0 -n %{name}-%{name}-%{version}-%{reldate} -p 1 for doc in ChangeLog; do %{_bindir}/iconv -f iso-8859-1 -t utf8 ${doc} > ${doc}.new @@ -56,6 +71,15 @@ done %{_bindir}/echo -e '\nACLOCAL_AMFLAGS = -I autoconf-archive/m4' >> Makefile.am %{_bindir}/autoreconf -fiv +%if 0%{?bootstrap} +%{__mkdir} -p bootstrap_ver +pushd bootstrap_ver +%{__tar} --strip-components=1 -xf %{SOURCE1} +%{__grep} -Rl '\-Werror' . | %{_bindir}/xargs %{__sed} -i -e 's!-Werror!!g' +%{_bindir}/autoreconf -fiv +popd +%endif + %build %configure \ @@ -67,19 +91,46 @@ done %{_bindir}/doxygen Doxyfile +%if 0%{?bootstrap} +pushd bootstrap_ver +%configure \ + --disable-rpath \ + --disable-silent-rules \ + --disable-static \ + --enable-shared \ + --enable-rdrand +%make_build +popd +%endif + %install +%if 0%{?bootstrap} +%make_install -C bootstrap_ver +rm -fr %{buildroot}%{_includedir}/%{name} \ + %{buildroot}%{_libdir}/lib%{name}.so \ + %{buildroot}%{_libdir}/pkgconfig +%endif + %make_install + +%{_bindir}/find %{buildroot} -name '*.a' -delete -print %{_bindir}/find %{buildroot} -name '*.la' -delete -print -%{__mkdir} -p %{buildroot}/%{_pkgdocdir} -%{__cp} -pr doc/html ChangeLog README README.* %{buildroot}/%{_pkgdocdir} -%{_sbindir}/hardlink -cvf %{buildroot}/%{_pkgdocdir} +%{__install} -Dpm 0644 json_object_private.h %{buildroot}%{_includedir}/%{name} + +%{__mkdir} -p %{buildroot}%{_pkgdocdir} +%{__cp} -pr doc/html ChangeLog README README.* %{buildroot}%{_pkgdocdir} +%{_sbindir}/hardlink -cvf %{buildroot}%{_pkgdocdir} %check %make_build check +%if 0%{?bootstrap} +%make_build -C bootstrap_ver check +%endif + %pretrans devel -p path = "%{_includedir}/%{name}" @@ -99,7 +150,10 @@ end %doc %dir %{_pkgdocdir} %license AUTHORS %license COPYING -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{so_ver}* +%if 0%{?bootstrap} +%{_libdir}/lib%{name}.so.%{so_ver_old}* +%endif %files devel @@ -119,8 +173,9 @@ end %changelog -* Sun Dec 10 2017 Björn Esser - 0.13-1 -- New upstream release (rhbz#1524155) +* Sun Dec 10 2017 Björn Esser - 0.13-0.1 +- Bootstrapping for so-name bump +- Keep json_object_private.h * Thu Aug 03 2017 Fedora Release Engineering - 0.12.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild