1
0

Accepting request 202966 from YaST:Head

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/202966
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yast2-installation?expand=0&rev=270
This commit is contained in:
Tomáš Chvátal 2013-10-11 13:35:26 +00:00 committed by Git OBS Bridge
commit cfb929dc98
4 changed files with 39 additions and 48 deletions

View File

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

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 27 16:34:11 UTC 2013 - lslezak@suse.cz
- do not use *.spec.in template, use *.spec file with RPM macros
instead
- 3.1.0
-------------------------------------------------------------------
Fri Sep 27 14:17:54 CEST 2013 - jsuchome@suse.cz

View File

@ -17,11 +17,11 @@
Name: yast2-installation
Version: 3.0.7
Version: 3.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-installation-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2
Requires: yast2-ruby-bindings >= 1.0.0
@ -36,7 +36,9 @@ BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
BuildRequires: update-desktop-files
BuildRequires: yast2-core-devel
BuildRequires: yast2-devtools
BuildRequires: yast2-devtools >= 3.0.6
# trang to convert rnc to rng
BuildRequires: trang
# xmllint
BuildRequires: libxml2-tools
@ -140,28 +142,13 @@ System installation code as present on installation media.
System installation code as present on installation media.
%prep
%setup -n yast2-installation-%{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
%yast_install
for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; do
%suse_update_desktop_file $f
@ -171,9 +158,6 @@ mkdir -p %{buildroot}%{_unitdir}
install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
%clean
rm -rf "$RPM_BUILD_ROOT"
%post
%{fillup_only -ns security checksig}
@ -204,40 +188,40 @@ rm -rf "$RPM_BUILD_ROOT"
%{_unitdir}/YaST2-Second-Stage.service
%{_unitdir}/YaST2-Firstboot.service
/usr/share/YaST2/clients/*.rb
/usr/share/YaST2/modules/*.rb
%{_prefix}/share/applications/YaST2/*.desktop
%{yast_clientdir}/*.rb
%{yast_moduledir}/*.rb
%{yast_desktopdir}/*.desktop
/usr/share/autoinstall/modules/*.desktop
/usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc
%dir /usr/share/autoinstall
%dir /usr/share/autoinstall/modules
%dir /usr/share/YaST2/include/installation
/usr/share/YaST2/include/installation/*
%dir %{yast_yncludedir}/installation
%{yast_yncludedir}/installation/*
# agents
/usr/share/YaST2/scrconf/etc_passwd.scr
/usr/share/YaST2/scrconf/cfg_boot.scr
/usr/share/YaST2/scrconf/cfg_windowmanager.scr
/usr/share/YaST2/scrconf/cfg_fam.scr
/usr/share/YaST2/scrconf/etc_install_inf.scr
/usr/share/YaST2/scrconf/etc_install_inf_alias.scr
/usr/share/YaST2/scrconf/etc_install_inf_options.scr
/usr/share/YaST2/scrconf/proc_modules.scr
/usr/share/YaST2/scrconf/run_df.scr
%{yast_scrconfdir}/etc_passwd.scr
%{yast_scrconfdir}/cfg_boot.scr
%{yast_scrconfdir}/cfg_windowmanager.scr
%{yast_scrconfdir}/cfg_fam.scr
%{yast_scrconfdir}/etc_install_inf.scr
%{yast_scrconfdir}/etc_install_inf_alias.scr
%{yast_scrconfdir}/etc_install_inf_options.scr
%{yast_scrconfdir}/proc_modules.scr
%{yast_scrconfdir}/run_df.scr
# fillup
/var/adm/fillup-templates/sysconfig.security-checksig
# programs and scripts
%{_prefix}/lib/YaST2/startup
%{yast_ystartupdir}/startup
%dir %{_prefix}/share/doc/packages/yast2-installation
%{_prefix}/share/doc/packages/yast2-installation/COPYING
%readme %{_prefix}/share/doc/packages/yast2-installation/README
%dir %{yast_docdir}
%{yast_docdir}/COPYING
%readme %{yast_docdir}/README
%files devel-doc
%defattr(-,root,root)
%doc %{_prefix}/share/doc/packages/yast2-installation
%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{_prefix}/share/doc/packages/yast2-installation/README
%doc %{yast_docdir}
%exclude %{yast_docdir}/COPYING
%exclude %{yast_docdir}/README
%changelog