4 changed files with 32 additions and 95 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/pam_wrapper-1.1.4.tar.gz
-SOURCES/pam_wrapper.keyring
+SOURCES/pam_wrapper-1.0.7.tar.gz
--- a/.pam_wrapper.metadata
+++ b/.pam_wrapper.metadata
@ -1,2 +1 @@
-dde61c296979dafd7a526995acb2acef6b119357 SOURCES/pam_wrapper-1.1.4.tar.gz
-3f2ab0bca02893402ba0ad172a6bd44456a65f86 SOURCES/pam_wrapper.keyring
+1fd93b95ce9d3ce59882b9f663cce8bfa35e6b74 SOURCES/pam_wrapper-1.0.7.tar.gz
--- a/SOURCES/pam_wrapper-1.1.4.tar.gz.asc
+++ b/SOURCES/pam_wrapper-1.1.4.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmF6YZYACgkQfuD8TcwB
-Tj0dCA//drNm6b6q3GhW1CX5Gksc9mNCbatwHYZMCOz1Km1TXEM6pQzIYU4JJiIX
-yRARln4dlrNHifsUbKOL0ipoRiCzBXeN1NK47TbefOB0vumykJwuG6LNBzbAz+a4
-iAZfvT5D2OPEJG7fkB5Pr97/AD09y5T8LlqphIsMDWTFuDErqm19MwfCgdaLA2jU
-3qA9MR88HTg5wyQIJ5cfjz1qVWfQlFUxsUy+D39HE7IotAxZISfJn8+mDToznFoG
-ZD0O4oMEUOvMelQPNeHworihlEVaTz9/k5VtTWAE70PzEQgxNWq1C8WOJpJ2TUDD
-H8aE0/6UC2u9ava5fUuzBeIaz4hqsnKIdgeLMxne9PoSLSyyAnjRseWwdhAiJmnh
-0JzKoqrB8bFQ446por2lBkJcph23w2jhrLPm/6nupndSFPPU0VKzA0R2MmR3T6JW
-wmJO3Eqs04P59k+4vxog9/AqHip6VF4WGtmE1sVwZdEeMEfBkXINUF31NIigCHkB
-1n1mbzxBTFb16+Qur0QpmeE5jLL/X1WWx6qWMcVZCxpNGarIjd18aMmiQmqO+ilU
-KYbdxc9ssCb/oyWHBLJW/jVzpBwUiN93I7iQaqb+2Se1Y9PI/E5mA2OHFiIXDpU5
-m39WX2jK9c393jlRY+geg2AQlYQ6I4TFdk1USiaMeZT6HuqMFTg=
-=wA4W
-----END PGP SIGNATURE-----
--- a/SPECS/pam_wrapper.spec
+++ b/SPECS/pam_wrapper.spec
@ -1,5 +1,5 @@
 Name:           pam_wrapper
-Version:        1.1.4
+Version:        1.0.7
 Release:        2%{?dist}

 Summary:        A tool to test PAM applications and PAM modules
@ -7,17 +7,13 @@ License:        GPLv3+
 Url:            http://cwrap.org/

 Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
-Source1:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
-Source2:        pam_wrapper.keyring

 BuildRequires:  gcc
-BuildRequires:  gnupg2
 BuildRequires:  cmake
 BuildRequires:  libcmocka-devel
 BuildRequires:  python3-devel
 BuildRequires:  pam-devel
 BuildRequires:  doxygen
-BuildRequires:  git

 Recommends:     cmake
 Recommends:     pkgconfig
@ -79,29 +75,42 @@ the header files for libpamtest


 %prep
-gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
-%autosetup -S git
+%setup -q


 %build
+if test ! -e "obj"; then
+  mkdir obj
+fi
+pushd obj
 %cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  -DUNIT_TESTING=ON
+  -DUNIT_TESTING=ON \
+  %{_builddir}/%{name}-%{version}

-%cmake_build
-%__cmake --build %{__cmake_builddir} --target doc
+make %{?_smp_mflags} VERBOSE=1
+make doc VERBOSE=1
+popd


 %install
-%cmake_install
+pushd obj
+make DESTDIR=%{buildroot} install
+popd

-%ldconfig_scriptlets

-%ldconfig_scriptlets -n libpamtest
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n libpamtest -p /sbin/ldconfig
+
+%postun -n libpamtest -p /sbin/ldconfig


 %check
-%ctest
+pushd obj
+ctest --output-on-failure
+popd

 %files
 %{_libdir}/libpam_wrapper.so*
@ -109,12 +118,10 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %dir %{_libdir}/cmake/pam_wrapper
 %{_libdir}/cmake/pam_wrapper/pam_wrapper-config-version.cmake
 %{_libdir}/cmake/pam_wrapper/pam_wrapper-config.cmake
-%{_libdir}/pam_wrapper/pam_chatty.so
 %{_libdir}/pam_wrapper/pam_matrix.so
 %{_libdir}/pam_wrapper/pam_get_items.so
 %{_libdir}/pam_wrapper/pam_set_items.so
 %{_mandir}/man1/pam_wrapper.1*
-%{_mandir}/man8/pam_chatty.8*
 %{_mandir}/man8/pam_matrix.8*
 %{_mandir}/man8/pam_get_items.8*
 %{_mandir}/man8/pam_set_items.8*
@ -125,72 +132,20 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %files -n libpamtest-devel
 %{_libdir}/libpamtest.so
 %{_libdir}/pkgconfig/libpamtest.pc
-%dir %{_libdir}/cmake/pamtest
-%{_libdir}/cmake/pamtest/pamtest-config-relwithdebinfo.cmake
-%{_libdir}/cmake/pamtest/pamtest-config-version.cmake
-%{_libdir}/cmake/pamtest/pamtest-config.cmake
+%dir %{_libdir}/cmake/libpamtest
+%{_libdir}/cmake/libpamtest/libpamtest-config-version.cmake
+%{_libdir}/cmake/libpamtest/libpamtest-config.cmake
 %{_includedir}/libpamtest.h

 %files -n libpamtest-doc
-%doc %{__cmake_builddir}/doc/html
+%doc obj/doc/html

 %files -n python3-libpamtest
 %{python3_sitearch}/pypamtest.so

 %changelog
-* Tue May 03 2022 Norbert Pocs <npocs@redhat.com> - 1.1.4-2
- related: rhbz#2048653 - Add package to CRB
-
-* Thu Apr 21 2022 Andreas Schneider <asn@redhat.com> - 1.1.4-1
- related: rhbz#2028819 - Update to version 1.1.4
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Aug 05 2020 Andreas Schneider <asn@redhat.com> - 1.1.3-5
- Build using new cmake macros
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-4
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-2
- Rebuilt for Python 3.9
-
-* Thu Mar 26 2020 Andreas Schneider <asn@redhat.com> - 1.1.3-1
- Update to version 1.1.3
-  * https://gitlab.com/cwrap/pam_wrapper/-/blob/master/CHANGELOG
-  * resolves: #1816943
-
-* Tue Mar 24 2020 Andreas Schneider <asn@redhat.com> - 1.1.2-1
- Update to version 1.1.2
-  * https://gitlab.com/cwrap/pam_wrapper/-/blob/master/CHANGELOG
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 22 2020 Bastien Nocera <bnocera@redhat.com> - 1.0.7-5
-+ pam_wrapper-1.0.7-5
- Fix crash in pam_wrapper
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.7-4
- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon May 9 2022 Norbert Pocs <npocs@redhat.com> - 1.0.7-2
+- resolves: rhbz#2048659 - Add package to CRB

 * Wed Sep 26 2018 Andreas Schneider <asn@redhat.com> - 1.0.7-1
 - Update to version 1.0.7