libksba: spec improvements & add devel subpackage

libassuan: spec improvements & add devel subpackage Change-Id: Id5ebf304a2284160bbac6dc2074976bf2880bd33 Signed-off-by: Shreenidhi Shedi <[email protected]> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/16126 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Tapas Kundu <[email protected]>
shatur93 · Jun 1, 2022 · 288820c · 288820c
1 parent 4e88f9d
commit 288820c
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 179 deletions.
diff --git a/SPECS/gnupg/gnupg.spec b/SPECS/gnupg/gnupg.spec
@@ -5,25 +5,28 @@ Release:        1%{?dist}
 License:        GPLv3+
 URL:            https://gnupg.org/index.html
 Group:          Applications/Cryptography.
-Source0:        https://gnupg.org/ftp/gcrypt/gnupg/%{name}-%{version}.tar.bz2
-%define sha1 gnupg=d928d4bd0808ffb8fe20d1161501401d5d389458
 Vendor:         VMware, Inc.
 Distribution:   Photon
+
+Source0:        https://gnupg.org/ftp/gcrypt/gnupg/%{name}-%{version}.tar.bz2
+%define sha512 %{name}=cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
+
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
 BuildRequires:  readline-devel
 BuildRequires:  npth-devel
-BuildRequires:  libassuan >= 2.5.0
-BuildRequires:  libksba >= 1.0.7
+BuildRequires:  libassuan-devel >= 2.5.0
+BuildRequires:  libksba-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error >= 1.24
+
 Requires:       libksba
 Requires:       libgcrypt >= 1.7.0
 Requires:       npth
 Requires:       libassuan
 Requires:       pinentry
-Provides:       gpg
 
+Provides:       gpg
 
 %description
 GnuPG is a complete and free implementation of the OpenPGP standard as defined
@@ -33,17 +36,19 @@ modules for all kinds of public key directories. GnuPG, also known as GPG, is
 a command line tool with features for easy integration with other applications.
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
+%if 0%{?with_check}
 %check
 make %{?_smp_mflags} check
+%endif
 
 %files
 %defattr(-,root,root)
@@ -53,26 +58,26 @@ make %{?_smp_mflags} check
 %{_mandir}/*
 %{_infodir}/gnupg*
 %{_libexecdir}/*
-%{_datadir}/gnupg/*
+%{_datadir}/%{name}/*
 %exclude %{_infodir}/dir
-%exclude /usr/share/doc/*
+%exclude %{_docdir}/*
 
 %changelog
-*   Tue Apr 13 2021 Gerrit Photon <[email protected]> 2.2.27-1
--   Automatic Version Bump
-*   Wed Sep 09 2020 Gerrit Photon <[email protected]> 2.2.23-1
--   Automatic Version Bump
-*   Thu Jul 16 2020 Gerrit Photon <[email protected]> 2.2.21-1
--   Automatic Version Bump
-*   Thu Apr 02 2020 Siddharth Chandrasekaran <[email protected]> 2.2.18-1
--   Upgrade to 2.2.18 to fix CVE-2019-14855
-*   Sat Oct 20 2018 Ankit Jain <[email protected]> 2.2.10-1
--   Update to 2.2.10
-*   Wed Aug 30 2017 Alexey Makhalov <[email protected]> 2.1.20-3
--   Add requires libgcrypt
-*   Wed Jun 07 2017 Danut Moraru <[email protected]> 2.1.20-2
--   Add pinentry dependency
-*   Tue Apr 11 2017 Danut Moraru <[email protected]> 2.1.20-1
--   Update to 2.1.20
-*   Wed Jul 27 2016 Kumar Kaushik <[email protected]> 2.0.30-1
--   Initial Build.
+* Tue Apr 13 2021 Gerrit Photon <[email protected]> 2.2.27-1
+- Automatic Version Bump
+* Wed Sep 09 2020 Gerrit Photon <[email protected]> 2.2.23-1
+- Automatic Version Bump
+* Thu Jul 16 2020 Gerrit Photon <[email protected]> 2.2.21-1
+- Automatic Version Bump
+* Thu Apr 02 2020 Siddharth Chandrasekaran <[email protected]> 2.2.18-1
+- Upgrade to 2.2.18 to fix CVE-2019-14855
+* Sat Oct 20 2018 Ankit Jain <[email protected]> 2.2.10-1
+- Update to 2.2.10
+* Wed Aug 30 2017 Alexey Makhalov <[email protected]> 2.1.20-3
+- Add requires libgcrypt
+* Wed Jun 07 2017 Danut Moraru <[email protected]> 2.1.20-2
+- Add pinentry dependency
+* Tue Apr 11 2017 Danut Moraru <[email protected]> 2.1.20-1
+- Update to 2.1.20
+* Wed Jul 27 2016 Kumar Kaushik <[email protected]> 2.0.30-1
+- Initial Build.
diff --git a/SPECS/gpgme/gpgme.spec b/SPECS/gpgme/gpgme.spec
@@ -1,56 +1,64 @@
-Summary:	High-Level Crypto API
-Name:		gpgme
-Version:	1.17.1
-Release:	1%{?dist}
-License:	GPLv2+
-URL:		https://www.gnupg.org/(it)/related_software/gpgme/index.html
-Group:		System Environment/Security
-Vendor:		VMware, Inc.
-Distribution:	Photon
-Source0:	https://www.gnupg.org/ftp/gcrypt/%{name}/%{name}-%{version}.tar.bz2
-%define sha512  gpgme=e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
-Requires:	libassuan
-Requires:	libgpg-error >= 1.32
+Summary:    High-Level Crypto API
+Name:       gpgme
+Version:    1.17.1
+Release:    1%{?dist}
+License:    GPLv2+
+URL:        https://www.gnupg.org/(it)/related_software/gpgme/index.html
+Group:      System Environment/Security
+Vendor:     VMware, Inc.
+Distribution:   Photon
+
+Source0:    https://www.gnupg.org/ftp/gcrypt/%{name}/%{name}-%{version}.tar.bz2
+%define sha512  %{name}=e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
+
+Requires:   libassuan
+Requires:   libgpg-error >= 1.32
 # gpgme uses gnupg binaries only at runtime
-Requires:	gnupg
-BuildRequires:	gnupg
-BuildRequires:	libgpg-error-devel >= 1.32
-BuildRequires:	libassuan >= 2.2.0
+Requires:   gnupg
+
+BuildRequires:  gnupg
+BuildRequires:  libgpg-error-devel >= 1.32
+BuildRequires:  libassuan-devel >= 2.2.0
 
 %description
 The GPGME package is a C language library that allows to add support for cryptography to a program. It is designed to make access to public key crypto engines like GnuPG or GpgSM easier for applications. GPGME provides a high-level crypto API for encryption, decryption, signing, signature verification and key management.
 
-%package 	devel
-Group:          Development/Libraries
-Summary:        Static libraries and header files from GPGME, GnuPG Made Easy.
-Requires:	%{name} = %{version}-%{release}
-Requires:	libgpg-error-devel >= 1.32
+%package    devel
+Group:      Development/Libraries
+Summary:    Static libraries and header files from GPGME, GnuPG Made Easy.
+Requires:   %{name} = %{version}-%{release}
+Requires:    libassuan-devel
+Requires:   libgpg-error-devel >= 1.32
 
-%description 	devel
+%description    devel
 Static libraries and header files from GPGME, GnuPG Made Easy.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 ./autogen.sh
 %configure \
- 	--disable-fd-passing \
-	--disable-static \
-	--enable-languages=cl \
-        --disable-gpgsm-test
+    --disable-fd-passing \
+    --disable-static \
+    --enable-languages=cl \
+    --disable-gpgsm-test
+
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} %{?_smp_mflags} install
-rm %{buildroot}/%{_libdir}/*.la
-rm -rf %{buildroot}/%{_infodir}
 
+rm -rf %{buildroot}%{_libdir}/*.la \
+       %{buildroot}/%{_infodir}
+
+%if 0%{?with_check}
 %check
 cd tests && make check-TESTS %{?_smp_mflags}
+%endif
 
 %post -p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -66,29 +74,29 @@ cd tests && make check-TESTS %{?_smp_mflags}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-*   Mon Apr 18 2022 Gerrit Photon <[email protected]> 1.17.1-1
--   Automatic Version Bump
-*   Tue Apr 13 2021 Gerrit Photon <[email protected]> 1.15.1-1
--   Automatic Version Bump
-*   Thu Jul 16 2020 Gerrit Photon <[email protected]> 1.14.0-1
--   Automatic Version Bump
-*   Sat Oct 20 2018 Ankit Jain <[email protected]> 1.11.1-2
--   Removed gpg2, gnupg-2.2.10 doesn't provide gpg2
-*   Tue Sep 11 2018 Anish Swaminathan <[email protected]> 1.11.1-1
--   Update version to 1.11.1
-*   Wed Aug 30 2017 Alexey Makhalov <[email protected]> 1.9.0-3
--   Add requires gnupg
-*   Thu Apr 20 2017 Alexey Makhalov <[email protected]> 1.9.0-2
--   Disabe C++ bindings
-*   Thu Apr 13 2017 Danut Moraru <[email protected]> 1.9.0-1
--   Update to version 1.9.0
-*   Thu Nov 24 2016 Alexey Makhalov <[email protected]> 1.6.0-3
--   Required libgpg-error-devel.
-*   Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.6.0-2
--   GA - Bump release of all rpms
-*   Thu Jan 14 2016 Xiaolin Li <[email protected]> 1.6.0-1
--   Updated to version 1.6.0
-*   Wed May 20 2015 Touseef Liaqat <[email protected]> 1.5.3-2
--   Updated group.
-*   Tue Dec 30 2014 Divya Thaluru <[email protected]> 1.5.3-1
--   Initial version.
+* Mon Apr 18 2022 Gerrit Photon <[email protected]> 1.17.1-1
+- Automatic Version Bump
+* Tue Apr 13 2021 Gerrit Photon <[email protected]> 1.15.1-1
+- Automatic Version Bump
+* Thu Jul 16 2020 Gerrit Photon <[email protected]> 1.14.0-1
+- Automatic Version Bump
+* Sat Oct 20 2018 Ankit Jain <[email protected]> 1.11.1-2
+- Removed gpg2, gnupg-2.2.10 doesn't provide gpg2
+* Tue Sep 11 2018 Anish Swaminathan <[email protected]> 1.11.1-1
+- Update version to 1.11.1
+* Wed Aug 30 2017 Alexey Makhalov <[email protected]> 1.9.0-3
+- Add requires gnupg
+* Thu Apr 20 2017 Alexey Makhalov <[email protected]> 1.9.0-2
+- Disabe C++ bindings
+* Thu Apr 13 2017 Danut Moraru <[email protected]> 1.9.0-1
+- Update to version 1.9.0
+* Thu Nov 24 2016 Alexey Makhalov <[email protected]> 1.6.0-3
+- Required libgpg-error-devel.
+* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.6.0-2
+- GA - Bump release of all rpms
+* Thu Jan 14 2016 Xiaolin Li <[email protected]> 1.6.0-1
+- Updated to version 1.6.0
+* Wed May 20 2015 Touseef Liaqat <[email protected]> 1.5.3-2
+- Updated group.
+* Tue Dec 30 2014 Divya Thaluru <[email protected]> 1.5.3-1
+- Initial version.
diff --git a/SPECS/libassuan/libassuan.spec b/SPECS/libassuan/libassuan.spec
@@ -1,61 +1,90 @@
-Summary:	Provides IPC between GnuPG Components
-Name:		libassuan
-Version:	2.5.5
-Release:	1%{?dist}
-License:	GPLv3+
-URL:		https://www.gnupg.org/(fr)/related_software/libassuan/index.html
-Group:		Development/Libraries
-Vendor:		VMware, Inc.
-Distribution:	Photon
-Source0:	ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.bz2
-%define sha1 libassuan=ec4f67c0117ccd17007c748a392ded96dc1b1ae9
-Requires:	libgpg-error >= 1.21
-BuildRequires:	libgpg-error-devel >= 1.21
+Summary:    Provides IPC between GnuPG Components
+Name:       libassuan
+Version:    2.5.5
+Release:    2%{?dist}
+License:    GPLv3+
+URL:        https://www.gnupg.org/(fr)/related_software/libassuan/index.html
+Group:      Development/Libraries
+Vendor:     VMware, Inc.
+Distribution:   Photon
+
+Source0:    https://www.gnupg.org/ftp/gcrypt/libassuan/%{name}-%{version}.tar.bz2
+%define sha512 %{name}=70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
+
+BuildRequires:  libgpg-error-devel >= 1.21
+
+Requires:   libgpg-error >= 1.21
+
 %description
-The libassuan package contains an inter process communication library
-used by some of the other GnuPG related packages. libassuan's primary use
+The %{name} package contains an inter process communication library
+used by some of the other GnuPG related packages. %{name}'s primary use
 is to allow a client to interact with a non-persistent server.
-libassuan is not, however, limited to use with GnuPG servers and clients.
+%{name} is not, however, limited to use with GnuPG servers and clients.
 It was designed to be flexible enough to meet the demands
 of many transaction based environments with non-persistent servers.
+
+%package devel
+Summary: GnuPG IPC library
+Requires: %{name} = %{version}-%{release}
+Requires: pkg-config
+
+%description devel
+This is the IPC static library used by GnuPG 2, GPGME and a few other
+packages.
+
+This package contains files needed to develop applications using %{name}.
+
 %prep
-%setup -q
+%autosetup -p1
+
 %build
 %configure
 make %{?_smp_mflags}
+
 %install
-make DESTDIR=%{buildroot} install
-rm %{buildroot}/%{_libdir}/*.la
-rm -rf %{buildroot}/%{_infodir}
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
+rm -rf %{buildroot}%{_libdir}/*.la \
+       %{buildroot}%{_infodir}
+
+%if 0%{?with_check}
 %check
 make %{?_smp_mflags} check
+%endif
+
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
 %files
 %defattr(-,root,root)
-%{_bindir}/*
-%{_includedir}/*.h
-%{_libdir}/*.so*
-%{_libdir}/pkgconfig/libassuan.pc
-%{_datadir}/aclocal/*
+%{_libdir}/*.so.*
+%{_bindir}/%{name}-config
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/aclocal/%{name}.m4
+
 %changelog
-*   Tue Apr 13 2021 Gerrit Photon <[email protected]> 2.5.5-1
--   Automatic Version Bump
-*   Wed Jul 08 2020 Gerrit Photon <[email protected]> 2.5.3-1
--   Automatic Version Bump
-*   Fri Sep 21 2018 Keerthana K <[email protected]> 2.5.1-1
--   Update to version 2.5.1
-*   Mon Apr 03 2017 Divya Thaluru <[email protected]> 2.4.3-1
--   Upgrade version to 2.4.3
-*   Thu Nov 24 2016 Alexey Makhalov <[email protected]> 2.4.2-3
--   BuildRequired libgpg-error-devel.
-*   Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 2.4.2-2
--   GA - Bump release of all rpms
-*   Fri Jan 15 2016 Xiaolin Li <[email protected]> 2.4.2-1
--   Updated to version 2.4.2
-*   Wed May 20 2015 Touseef Liaqat <[email protected]> 2.2.0-2
--   Updated group.
-*   Tue Dec 30 2014 Divya Thaluru <[email protected]> 2.2.0-1
--   Initial version
+* Tue May 24 2022 Shreenidhi Shedi <[email protected]> 2.5.5-2
+- Fix packaging, add devel sub package
+* Tue Apr 13 2021 Gerrit Photon <[email protected]> 2.5.5-1
+- Automatic Version Bump
+* Wed Jul 08 2020 Gerrit Photon <[email protected]> 2.5.3-1
+- Automatic Version Bump
+* Fri Sep 21 2018 Keerthana K <[email protected]> 2.5.1-1
+- Update to version 2.5.1
+* Mon Apr 03 2017 Divya Thaluru <[email protected]> 2.4.3-1
+- Upgrade version to 2.4.3
+* Thu Nov 24 2016 Alexey Makhalov <[email protected]> 2.4.2-3
+- BuildRequired libgpg-error-devel.
+* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 2.4.2-2
+- GA - Bump release of all rpms
+* Fri Jan 15 2016 Xiaolin Li <[email protected]> 2.4.2-1
+- Updated to version 2.4.2
+* Wed May 20 2015 Touseef Liaqat <[email protected]> 2.2.0-2
+- Updated group.
+* Tue Dec 30 2014 Divya Thaluru <[email protected]> 2.2.0-1
+- Initial version