< Wed Nov 16 11:22:38 CET 2011 - jsuchome@suse.cz
< 
< - merged texts from proofreading
< - 2.22.0 
< 
< -------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-update?expand=0&rev=23
This commit is contained in:
Jiří Suchomel 2011-11-16 10:23:58 +00:00 committed by Git OBS Bridge
parent e26f91d147
commit c1300a6ddd
4 changed files with 19 additions and 15 deletions

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35600b98d7a4bc2af551a14509181b50ec89e30212e5464eb1d57a274b546319
size 118082

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 16 11:22:38 CET 2011 - jsuchome@suse.cz
- merged texts from proofreading
- 2.22.0
-------------------------------------------------------------------
Fri Sep 23 11:01:27 UTC 2011 - lslezak@suse.cz

View File

@ -19,16 +19,14 @@
Name: yast2-update
Version: 2.21.1
Version: 2.22.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-update-%{version}.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
License: GPL-2.0+
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
# FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12
@ -88,23 +86,23 @@ Use this component if you wish to update your system.
%setup -n yast2-update-%{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
@ -114,7 +112,7 @@ rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
%{prefix}/lib/YaST2/bin/*
%{_prefix}/lib/YaST2/bin/*
/usr/share/YaST2/modules/*
/usr/share/YaST2/clients/inst_rootpart.ycp
@ -131,11 +129,11 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/YaST2/include/update
/usr/share/YaST2/include/update/rootpart.ycp
%doc %{prefix}/share/doc/packages/yast2-update
%doc %{_prefix}/share/doc/packages/yast2-update
%files FACTORY
%defattr(-,root,root)
%{prefix}/share/applications/YaST2/update.desktop
%{_prefix}/share/applications/YaST2/update.desktop
%dir /usr/share/YaST2/control
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp