diff --git a/yast2-users-2.21.8.tar.bz2 b/yast2-users-2.21.8.tar.bz2 deleted file mode 100644 index 4b9f73a..0000000 --- a/yast2-users-2.21.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7aab5751ca42f3dfbb47647bccaf535143e1b2360efae25f51c1227b66f65cf -size 432651 diff --git a/yast2-users-2.21.9.tar.bz2 b/yast2-users-2.21.9.tar.bz2 new file mode 100644 index 0000000..1727d65 --- /dev/null +++ b/yast2-users-2.21.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48dc54d327d79a713ea3d33ecf07b815a3aba72c8b6e891a16d775ef79118b92 +size 445638 diff --git a/yast2-users.changes b/yast2-users.changes index 3e5f2d1..e968478 100644 --- a/yast2-users.changes +++ b/yast2-users.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 24 11:35:05 CEST 2011 - jsuchome@suse.cz + +- testsuite adapted to last change of yast2-pam +- 2.21.9 + ------------------------------------------------------------------- Mon Sep 26 16:01:05 CEST 2011 - visnov@suse.cz diff --git a/yast2-users.spec b/yast2-users.spec index 5f84273..630c192 100644 --- a/yast2-users.spec +++ b/yast2-users.spec @@ -19,16 +19,14 @@ Name: yast2-users -Version: 2.21.8 +Version: 2.21.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-users-%{version}.tar.bz2 -Prefix: /usr - Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext @@ -57,23 +55,23 @@ This package provides GUI for maintenance of linux users and groups. %setup -n yast2-users-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./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 %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 +[ -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 @@ -86,7 +84,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir /usr/share/YaST2/include/users %dir /usr/share/YaST2/modules/YaPI /usr/share/YaST2/clients/*.ycp -%{prefix}/share/applications/YaST2/*.desktop +%{_prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/modules/*.pm /usr/share/YaST2/modules/UsersUI.y* /usr/share/YaST2/modules/YaPI/*.pm @@ -99,6 +97,6 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/YaST2/plugin/libpy2ag_crack.so.* %{_libdir}/YaST2/plugin/libpy2ag_crack.so %{_libdir}/YaST2/plugin/libpy2ag_crack.la -%doc %{prefix}/share/doc/packages/yast2-users +%doc %{_prefix}/share/doc/packages/yast2-users %changelog