From 3c101cbf504c3f37c6396c8e7c7a8b223c46a784 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Wed, 11 Jul 2018 18:34:53 +0200 Subject: [PATCH 1/4] Yet more specfile cleanup --- contrib/spec/openarc.spec.in | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/contrib/spec/openarc.spec.in b/contrib/spec/openarc.spec.in index 5c37444f..9578f6f7 100644 --- a/contrib/spec/openarc.spec.in +++ b/contrib/spec/openarc.spec.in @@ -34,7 +34,6 @@ Requires(postun): initscripts %endif Source0: openarc-%{version}.tar.gz -Prefix: %{_prefix} %description The Trusted Domain Project is a community effort to develop and maintain a @@ -61,8 +60,8 @@ required for developing applications against libopenarc. %build %configure --disable-static - make %{?_smp_mflags} + %install make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_sysconfdir} @@ -156,14 +155,11 @@ fi exit 0 %endif -%post -n libopenarc -p /sbin/ldconfig - -%postun -n libopenarc -p /sbin/ldconfig - +%ldconfig_scriptlets -n libopenarc %files -%defattr(-,root,root) -%doc LICENSE LICENSE.Sendmail README RELEASE_NOTES +%license LICENSE LICENSE.Sendmail +%doc README RELEASE_NOTES %config(noreplace) %{_sysconfdir}/openarc.conf %if %{tmpfiles} @@ -182,13 +178,11 @@ exit 0 %files -n libopenarc -%doc LICENSE LICENSE.Sendmail -%defattr(-,root,root) +%license LICENSE LICENSE.Sendmail %{_libdir}/*.so.* %files -n libopenarc-devel -%defattr(-,root,root) -%doc LICENSE LICENSE.Sendmail +%license LICENSE LICENSE.Sendmail %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc From 712ef16386e50c0f5bec5845a85306a7f7a280c5 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Thu, 12 Jul 2018 12:01:14 +0200 Subject: [PATCH 2/4] Update to 1.0.0 beta 0 --- contrib/spec/openarc.spec.in | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/contrib/spec/openarc.spec.in b/contrib/spec/openarc.spec.in index 9578f6f7..1d8d2fec 100644 --- a/contrib/spec/openarc.spec.in +++ b/contrib/spec/openarc.spec.in @@ -1,12 +1,16 @@ %global systemd (0%{?fedora} >= 18) || (0%{?rhel} >= 7) %global tmpfiles (0%{?fedora} >= 15) || (0%{?rhel} >= 7) +%global pre_rel Beta0 + Summary: An open source library and milter for providing ARC service Name: openarc Version: @VERSION@ -Release: 1%{?dist} +Release: %{?pre_rel:0.}1%{?pre_rel:.%pre_rel}%{?dist} License: BSD and Sendmail -URL: https://github.com/mskucherawy/OpenARC +URL: https://github.com/trusteddomainproject/OpenARC + +Source0: https://github.com/trusteddomainproject/OpenARC/archive/v%{version}%{?pre_rel:.%pre_rel}/%{name}-%{version}%{?pre_rel:.%pre_rel}.tar.gz BuildRequires: libtool BuildRequires: pkgconfig(openssl) @@ -19,6 +23,9 @@ BuildRequires: sendmail-milter-devel BuildRequires: sendmail-devel %endif +BuildRequires: autoconf +BuildRequires: automake + Requires: lib%{name}%{?_isa} = %{version}-%{release} Requires: libopenarc = %{version}-%{release} Requires(pre): shadow-utils @@ -33,7 +40,6 @@ Requires(preun): chkconfig, initscripts Requires(postun): initscripts %endif -Source0: openarc-%{version}.tar.gz %description The Trusted Domain Project is a community effort to develop and maintain a @@ -56,9 +62,10 @@ This package contains the static libraries, headers, and other support files required for developing applications against libopenarc. %prep -%autosetup -p1 +%autosetup -n OpenARC-%{version}%{?pre_rel:.%pre_rel} -p1 %build +autoreconf --install %configure --disable-static make %{?_smp_mflags} @@ -188,5 +195,9 @@ exit 0 %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 11 2018 Xavier Bachelot 1.0.0-0.1.Beta0 +- Specfile clean up. +- Update to 1.0.0 beta 0. + * Sun Jul 23 2017 Matt Domsch 0.1.0-1 - update to Fedora Packaging Guidelines From 46d6d2fcc4d86239b9dc7221d1ab331356a01059 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 13 Jul 2018 10:48:20 +0200 Subject: [PATCH 3/4] Doc fixes --- contrib/spec/openarc.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/spec/openarc.spec.in b/contrib/spec/openarc.spec.in index 1d8d2fec..f53205d0 100644 --- a/contrib/spec/openarc.spec.in +++ b/contrib/spec/openarc.spec.in @@ -78,7 +78,7 @@ rm %{buildroot}/%{_libdir}/*.la cat > %{buildroot}%{_sysconfdir}/openarc.conf < Date: Wed, 19 Sep 2018 15:06:35 +0200 Subject: [PATCH 4/4] Sync with Fedora spec All changes but the release bump and additional changelog entry, as well as the non-upstream patches. All of Matt Domsch' changes to the specfile are there though. --- contrib/spec/openarc.spec.in | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/contrib/spec/openarc.spec.in b/contrib/spec/openarc.spec.in index f53205d0..27c30584 100644 --- a/contrib/spec/openarc.spec.in +++ b/contrib/spec/openarc.spec.in @@ -12,7 +12,7 @@ URL: https://github.com/trusteddomainproject/OpenARC Source0: https://github.com/trusteddomainproject/OpenARC/archive/v%{version}%{?pre_rel:.%pre_rel}/%{name}-%{version}%{?pre_rel:.%pre_rel}.tar.gz -BuildRequires: libtool +BuildRequires: libtool gcc BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libbsd) @@ -67,11 +67,11 @@ required for developing applications against libopenarc. %build autoreconf --install %configure --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}%{_sysconfdir} +%make_install +mkdir -p -m 0700 %{buildroot}%{_sysconfdir}/%{name} mkdir -p -m 0700 %{buildroot}%{_localstatedir}/run/%{name} rm -r %{buildroot}%{_prefix}/share/doc/openarc rm %{buildroot}/%{_libdir}/*.la @@ -79,15 +79,20 @@ rm %{buildroot}/%{_libdir}/*.la cat > %{buildroot}%{_sysconfdir}/openarc.conf < %{buildroot}%{_sysconfdir}/%{name}/PeerList <