New upstream release

.gitignore

@@ -1,5 +1 @@
-/jose-3.tar.bz2
+/jose-8.tar.bz2
-/jose-4.tar.bz2
-/jose-5.tar.bz2
-/jose-6.tar.bz2
-/jose-7.tar.bz2

jose.spec

@@ -1,5 +1,5 @@
 Name:           jose
-Version:        7
+Version:        8
 Release:        1%{?dist}
 Summary:        Tools for JSON Object Signing and Encryption (JOSE)
 
@@ -8,7 +8,7 @@ URL:            https://github.com/latchset/%{name}
 Source0:        https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 
 BuildRequires:  pkgconfig
-BuildRequires:  jansson-devel >= 2.9
+BuildRequires:  jansson-devel >= 2.10
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
@@ -20,7 +20,11 @@ crypto stack including key generation, signing and encryption.
 
 %package -n lib%{name}
 Summary:        Library implementing JSON Object Signing and Encryption
-Conflicts:      jansson < 2.9
+Conflicts:      jansson < 2.10
+Provides:       lib%{name}-openssl = %{version}-%{release}
+Obsoletes:      lib%{name}-openssl < %{version}-%{release}
+Provides:       lib%{name}-zlib = %{version}-%{release}
+Obsoletes:      lib%{name}-zlib < %{version}-%{release}
 
 %description -n lib%{name}
 This package contains a C library for performing JOSE operations.
@@ -30,47 +34,20 @@ Summary:        Development files for lib%{name}
 Requires:       lib%{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       jansson-devel
+Provides:       lib%{name}-openssl-devel = %{version}-%{release}
+Obsoletes:      lib%{name}-openssl-devel < %{version}-%{release}
+Provides:       lib%{name}-zlib-devel = %{version}-%{release}
+Obsoletes:      lib%{name}-zlib-devel < %{version}-%{release}
 
 %description -n lib%{name}-devel
 This package contains development files for lib%{name}.
 
-%package -n lib%{name}-openssl
-Summary:        Integration with OpenSSL for lib%{name}
-
-%description -n lib%{name}-openssl
-This package contains OpenSSL integration for lib%{name}.
-
-%package -n lib%{name}-openssl-devel
-Summary:        Development files for lib%{name}-openssl
-Requires:       lib%{name}-openssl%{?_isa} = %{version}-%{release}
-Requires:       pkgconfig
-Requires:       openssl-devel
-
-%description -n lib%{name}-openssl-devel
-This package contains development files for lib%{name}-openssl.
-
-%package -n lib%{name}-zlib
-Summary:        Integration with zlib for lib%{name}
-
-%description -n lib%{name}-zlib
-This package contains zlib integration for lib%{name}.
-
-%package -n lib%{name}-zlib-devel
-Summary:        Development files for lib%{name}-zlib
-Requires:       lib%{name}-zlib%{?_isa} = %{version}-%{release}
-Requires:       pkgconfig
-
-%description -n lib%{name}-zlib-devel
-This package contains development files for lib%{name}-zlib.
-
 %prep
 %setup -q
 
 %build
 %if 0%{?rhel}
-%__sed -i 's|libcrypto >= 1\.0\.2|libcrypto >= 1\.0\.1|' configure jose-openssl.pc.in
+%__sed -i 's|libcrypto >= 1\.0\.2|libcrypto >= 1\.0\.1|' configure
-%__sed -i 's| -Wl,--push-state||' jose-openssl.pc.in jose-zlib.pc.in
-%__sed -i 's| -Wl,--pop-state||' jose-openssl.pc.in jose-zlib.pc.in
 %endif
 %configure
 make %{?_smp_mflags}
@@ -79,21 +56,16 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 %make_install
 rm -rf %{buildroot}/%{_libdir}/lib%{name}.la
-rm -rf %{buildroot}/%{_libdir}/lib%{name}-openssl.la
-rm -rf %{buildroot}/%{_libdir}/lib%{name}-zlib.la
 
 %check
 make %{?_smp_mflags} check
 
 %post -n lib%{name} -p /sbin/ldconfig
-%post -n lib%{name}-zlib -p /sbin/ldconfig
-%post -n lib%{name}-openssl -p /sbin/ldconfig
 %postun -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name}-zlib -p /sbin/ldconfig
-%postun -n lib%{name}-openssl -p /sbin/ldconfig
 
 %files
 %{_bindir}/%{name}
+%{_mandir}/man1/jose*.1*
 
 %files -n lib%{name}
 %license COPYING
@@ -101,32 +73,15 @@ make %{?_smp_mflags} check
 
 %files -n lib%{name}-devel
 %dir %{_includedir}/%{name}
-%{_includedir}/%{name}/buf.h
+%{_includedir}/%{name}/*.h
-%{_includedir}/%{name}/b64.h
-%{_includedir}/%{name}/jwk.h
-%{_includedir}/%{name}/jws.h
-%{_includedir}/%{name}/jwe.h
-%{_includedir}/%{name}/jose.h
-%{_includedir}/%{name}/hooks.h
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-
+%{_mandir}/man3/jose*.3*
-%files -n lib%{name}-openssl
-%{_libdir}/lib%{name}-openssl.so.*
-
-%files -n lib%{name}-openssl-devel
-%{_includedir}/%{name}/openssl.h
-%{_libdir}/lib%{name}-openssl.so
-%{_libdir}/pkgconfig/%{name}-openssl.pc
-
-%files -n lib%{name}-zlib
-%{_libdir}/lib%{name}-zlib.so.*
-
-%files -n lib%{name}-zlib-devel
-%{_libdir}/lib%{name}-zlib.so
-%{_libdir}/pkgconfig/%{name}-zlib.pc
 
 %changelog
+* Wed Jun 14 2017 Nathaniel McCallum <npmccallum@redhat.com> - 8-1
+- New upstream release
+
 * Fri Mar 17 2017 Nathaniel McCallum <npmccallum@redhat.com> - 7-1
 - New upstream release
 

sources

@@ -1 +1 @@
-SHA512 (jose-7.tar.bz2) = 66180d628c7deba9e423aa72e4cfd0cc0718bdefe6b0c0538c8adbadc7b433e7ca708505991f238c2533e994a323d729535ac8c90421bb7be51b8fc0f4781873
+SHA512 (jose-8.tar.bz2) = 38c0be60a53d928d3af77c9143d0098124b28ef9f5baccba82990526395cc01a6ffec232fe29e0ce106a30c9bdafa67a4dbdcb79c461f2fcd88c22e960407ff5