Um, the YaST *.spec files are generated from *.spec.in file templates during 'make package' call. (See http://svn.opensuse.org/viewvc/yast/trunk/autoinstallation/autoyast2.spec.in?view=markup file in this case)
This means that we need to change yast2-devtools package instead of autoyast2 (so this would also change it in all other YaST modules). Martin? -------- Původní zpráva -------- Předmět: [obs submit-request 82822] YaST:Head/autoyast2: created by jengelh Datum: Sat, 17 Sep 2011 18:47:19 +0000 Od: <[email protected]> Přeposláno - Komu: [email protected] Komu: Ladislav Slezak<[email protected]> home:jengelh:bl-a2/autoyast2 -> YaST:Head/autoyast2 https://build.opensuse.org/request/diff/82822 Description: - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build - Rip out Prefix:, probably misunderstand tag changes files: -------------- --- autoyast2.changes +++ autoyast2.changes @@ -1,0 +2,7 @@ +Sat Sep 17 13:47:21 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build +- Rip out Prefix:, probably misunderstand tag + +------------------------------------------------------------------- spec files: ----------- --- autoyast2.spec +++ autoyast2.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: autoyast2 @@ -24,9 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: autoyast2-2.21.1.tar.bz2 - -Prefix: /usr - Group: System/YaST License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer @@ -87,23 +83,23 @@ %setup -n autoyast2-2.21.1 %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 +make %{?_smp_mflags} 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 @@ -129,9 +125,6 @@ install -d $RPM_BUILD_ROOT/var/lib/autoinstall/autoconf install -d $RPM_BUILD_ROOT/var/lib/autoinstall/tmp -%clean -rm -rf "$RPM_BUILD_ROOT" - %post %{fillup_only -n autoinstall} @@ -144,9 +137,9 @@ %dir /var/lib/autoinstall/repository/rules %dir /var/lib/autoinstall/repository/classes %dir /var/lib/autoinstall/tmp -%doc %{prefix}/share/doc/packages/autoyast2 +%doc %_prefix/share/doc/packages/autoyast2 -%{prefix}/share/applications/YaST2/autoyast.desktop +%_prefix/share/applications/YaST2/autoyast.desktop /usr/share/autoinstall/modules/*.desktop /usr/share/YaST2/include/autoinstall/classes.ycp /usr/share/YaST2/include/autoinstall/conftree.ycp @@ -247,7 +240,7 @@ /usr/share/YaST2/include/autoinstall/ask.ycp # scripts -%{prefix}/lib/YaST2/bin/fetch_image.sh +%_prefix/lib/YaST2/bin/fetch_image.sh %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts @@ -257,4 +250,5 @@ %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf + %changelog other changes: -------------- To REVIEW against the previous version: osc request show --diff 82822 To ACCEPT the request: osc request accept 82822 --message="reviewed ok." To DECLINE the request: osc request decline 82822 --message="declined for reason xyz (see ... for background / policy / ...)." To REVOKE the request: osc request revoke 82822 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
