Accepting request 113126 from YaST:Head

- version 2.22.1
- Changed license to GPL 2.0
- merged proofed texts
- change potential race of chmod after file create (bnc#753129)

OBS-URL: https://build.opensuse.org/request/show/113126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-iscsi-client?expand=0&rev=74
This commit is contained in:
Stephan Kulow 2012-04-12 07:57:55 +00:00 committed by Git OBS Bridge
commit 3c8d680fe7
4 changed files with 45 additions and 21 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81c6a2b33fe191435bc6ab20d6be39d97e24c1468623be48c0bcd644f87e5f4b
size 106536

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92525faed794815758d208d8eba63388603eae9424bdf73898763fff92f496c6
size 106887

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Apr 10 17:36:36 CEST 2012 - fehr@suse.de
- version 2.22.1
- Changed license to GPL 2.0
-------------------------------------------------------------------
Thu Mar 29 15:15:41 CEST 2012 - jsuchome@suse.cz
- merged proofed texts
-------------------------------------------------------------------
Wed Mar 21 11:48:21 CET 2012 - fehr@suse.de
- change potential race of chmod after file create (bnc#753129)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 15 11:36:05 CET 2012 - fehr@suse.de Wed Feb 15 11:36:05 CET 2012 - fehr@suse.de

View File

@ -15,21 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: yast2-iscsi-client Name: yast2-iscsi-client
Version: 2.22.0 Version: 2.22.1
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-iscsi-client-2.22.0.tar.bz2 Source0: yast2-iscsi-client-%{version}.tar.bz2
Prefix: /usr BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
Group: System/YaST BuildRequires: libicu-devel
License: GPL-2.0+ BuildRequires: libxslt
BuildRequires: docbook-xsl-stylesheets doxygen libicu-devel libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-packager yast2-perl-bindings yast2-testsuite BuildRequires: perl-XML-Writer
BuildRequires: popt-devel
BuildRequires: sgml-skel
BuildRequires: update-desktop-files
BuildRequires: yast2
BuildRequires: yast2-devtools
BuildRequires: yast2-packagemanager-devel
BuildRequires: yast2-packager
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
Requires: yast2-packager Requires: yast2-packager
@ -41,32 +48,33 @@ Requires: yast2 >= 2.21.22
BuildArch: noarch BuildArch: noarch
Summary: YaST2 - iSCSI Client Configuration Summary: YaST2 - iSCSI Client Configuration
License: GPL-2.0
Group: System/YaST
%description %description
This package contains the YaST2 component for configuration of an iSCSI This package contains the YaST2 component for configuration of an iSCSI
client. client.
%prep %prep
%setup -n yast2-iscsi-client-2.22.0 %setup -n yast2-iscsi-client-%{version}
%build %build
%{prefix}/bin/y2tool y2autoconf %{_prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake %{_prefix}/bin/y2tool y2automake
autoreconf --force --install autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$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) # V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works # so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" 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" [ -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 for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/} d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done done
@ -83,9 +91,9 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/YaST2/clients/inst_iscsi-client.ycp /usr/share/YaST2/clients/inst_iscsi-client.ycp
/usr/share/YaST2/modules/IscsiClient.* /usr/share/YaST2/modules/IscsiClient.*
/usr/share/YaST2/modules/IscsiClientLib.* /usr/share/YaST2/modules/IscsiClientLib.*
%{prefix}/share/applications/YaST2/iscsi-client.desktop %{_prefix}/share/applications/YaST2/iscsi-client.desktop
/usr/share/YaST2/scrconf/iscsid.scr /usr/share/YaST2/scrconf/iscsid.scr
%doc %{prefix}/share/doc/packages/yast2-iscsi-client %doc %{_prefix}/share/doc/packages/yast2-iscsi-client
/usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc /usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc
%changelog %changelog