From 6e4a2eea8436a63d5d6108e8a6f309c87dc237af6e9f1c7f64c88c1c5efef610 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 1 Aug 2013 07:30:21 +0000 Subject: [PATCH 1/6] Update to last successful build OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-pam?expand=0&rev=130 --- yast2-pam-3.0.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2 index 64e72df..3edc0f4 100644 --- a/yast2-pam-3.0.0.tar.bz2 +++ b/yast2-pam-3.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0fb98ae29a9790c03adabc7f30a6d60ffc6ebb7dc57ff99180e1d3c76edf92b -size 92881 +oid sha256:2aa446575a03e7dc5a25fb4fd762fb34041e1bd49b2a442603861cd4df3634cd +size 92959 From bb382b7c80939e6edeba9a0ff7a8e542f5fe7cc8e3e8c2d5b248935b10467cf7 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 2 Aug 2013 16:01:31 +0000 Subject: [PATCH 2/6] Update to last successful build OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-pam?expand=0&rev=131 --- yast2-pam-3.0.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2 index 3edc0f4..1932f24 100644 --- a/yast2-pam-3.0.0.tar.bz2 +++ b/yast2-pam-3.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2aa446575a03e7dc5a25fb4fd762fb34041e1bd49b2a442603861cd4df3634cd -size 92959 +oid sha256:78cddee0418bf6a8874d732ab1f3baf99daf468f1e7ae2e0db3851c2770d3284 +size 92974 From 3b2a3122cb35bf9873b01d8c9d029319ec9674bad4e6713993288f3b9cab5f4a Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Wed, 7 Aug 2013 16:19:57 +0000 Subject: [PATCH 3/6] Update to last successful build OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-pam?expand=0&rev=132 --- yast2-pam-3.0.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2 index 1932f24..7c27c95 100644 --- a/yast2-pam-3.0.0.tar.bz2 +++ b/yast2-pam-3.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78cddee0418bf6a8874d732ab1f3baf99daf468f1e7ae2e0db3851c2770d3284 -size 92974 +oid sha256:9d66ad444d1e71897e489ed1e146e8227fed7e923e465e05a7bba7c34cc47c0a +size 92960 From 3ff2e9a5b756967a79f420e7b67bdb59646fecf1ebd83b8cb87d4304c7a03985 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 13 Aug 2013 09:10:25 +0000 Subject: [PATCH 4/6] Update to last successful build OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-pam?expand=0&rev=133 --- yast2-pam-3.0.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2 index 7c27c95..13aa60d 100644 --- a/yast2-pam-3.0.0.tar.bz2 +++ b/yast2-pam-3.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d66ad444d1e71897e489ed1e146e8227fed7e923e465e05a7bba7c34cc47c0a -size 92960 +oid sha256:e21480738fa1a983a29f9599e2c720574b82bd37374d4f8b137f4ac6f1fc2358 +size 93253 From 6c62f0e408233a9bb9fe73fc4942b2976902d8dfaf256208e236cb73e4b04f16 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 13 Aug 2013 14:10:58 +0000 Subject: [PATCH 5/6] Update to last successful build OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-pam?expand=0&rev=134 --- yast2-pam-3.0.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2 index 13aa60d..654862e 100644 --- a/yast2-pam-3.0.0.tar.bz2 +++ b/yast2-pam-3.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e21480738fa1a983a29f9599e2c720574b82bd37374d4f8b137f4ac6f1fc2358 -size 93253 +oid sha256:6b1e76b592253c506b01b475423f69ac0f3597a3813e10bd51a7b09472731493 +size 93314 From d9766571d01511b14ada13b9e4904b376d05ef4fa207c35bc09446c0d07ea66d Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 8 Oct 2013 12:51:18 +0000 Subject: [PATCH 6/6] - do not use *.spec.in template, use *.spec file with RPM macros instead - 3.1.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-pam?expand=0&rev=135 --- yast2-pam-3.0.0.tar.bz2 | 3 --- yast2-pam-3.1.0.tar.bz2 | 3 +++ yast2-pam.changes | 7 +++++++ yast2-pam.spec | 38 ++++++++++---------------------------- 4 files changed, 20 insertions(+), 31 deletions(-) delete mode 100644 yast2-pam-3.0.0.tar.bz2 create mode 100644 yast2-pam-3.1.0.tar.bz2 diff --git a/yast2-pam-3.0.0.tar.bz2 b/yast2-pam-3.0.0.tar.bz2 deleted file mode 100644 index 654862e..0000000 --- a/yast2-pam-3.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b1e76b592253c506b01b475423f69ac0f3597a3813e10bd51a7b09472731493 -size 93314 diff --git a/yast2-pam-3.1.0.tar.bz2 b/yast2-pam-3.1.0.tar.bz2 new file mode 100644 index 0000000..dfa5a4e --- /dev/null +++ b/yast2-pam-3.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e903060cd60d0fca470cff1555314111307fc6eca733c16951a2dfa44387f9c +size 14233 diff --git a/yast2-pam.changes b/yast2-pam.changes index 647b24c..661b08e 100644 --- a/yast2-pam.changes +++ b/yast2-pam.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 19 12:42:45 UTC 2013 - lslezak@suse.cz + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + ------------------------------------------------------------------- Wed Jul 31 08:36:33 UTC 2013 - yast-devel@opensuse.org diff --git a/yast2-pam.spec b/yast2-pam.spec index 182e687..1fde895 100644 --- a/yast2-pam.spec +++ b/yast2-pam.spec @@ -17,17 +17,17 @@ Name: yast2-pam -Version: 3.0.0 +Version: 3.1.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pam-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRequires: doxygen BuildRequires: perl-XML-Writer BuildRequires: yast2 BuildRequires: yast2-core-devel -BuildRequires: yast2-devtools +BuildRequires: yast2-devtools >= 3.0.6 BuildRequires: yast2-testsuite Requires: yast2 @@ -50,37 +50,19 @@ Group: System/YaST This agent is used by YaST2 to modify the PAM configuration files %prep -%setup -n yast2-pam-%{version} +%setup -n %{name}-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} -# V=1: verbose build in case we used AM_SILENT_RULES(yes) -# so that RPM_OPT_FLAGS check works -make %{?jobs:-j%jobs} V=1 +%yast_build %install -make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done - -%clean -rm -rf "$RPM_BUILD_ROOT" +%yast_install %files %defattr(-,root,root) -/usr/share/YaST2/modules/* -/usr/share/YaST2/scrconf/*.scr -/usr/lib/YaST2/servers_non_y2/ag_passwd -%doc %{_prefix}/share/doc/packages/yast2-pam +%{yast_moduledir}/* +%{yast_scrconfdir}/*.scr +%{yast_agentdir}/ag_passwd +%doc %{yast_docdir} %changelog