diff --git a/yast2-bootloader.changes b/yast2-bootloader.changes index c2e89b6..135ba60 100644 --- a/yast2-bootloader.changes +++ b/yast2-bootloader.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 25 12:17:41 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Fri Oct 21 15:34:43 CEST 2011 - snwint@suse.de diff --git a/yast2-bootloader.spec b/yast2-bootloader.spec index 9320816..5aa6dab 100644 --- a/yast2-bootloader.spec +++ b/yast2-bootloader.spec @@ -15,21 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-bootloader Version: 2.21.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.21.2.tar.bz2 +Source0: yast2-bootloader-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ -BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage >= 2.18.18 yast2-testsuite +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: limal-perl +BuildRequires: perl-Bootloader +BuildRequires: perl-XML-Writer +BuildRequires: perl-gettext +BuildRequires: sgml-skel +BuildRequires: swig +BuildRequires: update-alternatives +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools +BuildRequires: yast2-installation +BuildRequires: yast2-perl-bindings +BuildRequires: yast2-storage >= 2.18.18 +BuildRequires: yast2-testsuite # to eliminate a cyclic dependency in autobuild: #!BuildIgnore: autoyast2-installation PreReq: /bin/sed %fillup_prereq @@ -63,31 +74,33 @@ Provides: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom- Obsoletes: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel Summary: YaST2 - Bootloader Configuration +License: GPL-2.0+ +Group: System/YaST %description This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.21.2 +%setup -n yast2-bootloader-%{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 @@ -104,10 +117,10 @@ rm -rf "$RPM_BUILD_ROOT" # menu items %ifnarch s390 s390x -%{prefix}/share/applications/YaST2/bootloader.desktop +%{_prefix}/share/applications/YaST2/bootloader.desktop %endif -%doc %{prefix}/share/doc/packages/yast2-bootloader +%doc %{_prefix}/share/doc/packages/yast2-bootloader %dir /usr/share/YaST2/include/bootloader /usr/share/YaST2/include/bootloader/* @@ -115,7 +128,7 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/clients/bootloader*.ycp /usr/share/YaST2/clients/print-product.ycp /usr/share/YaST2/clients/inst_*.ycp -%{prefix}/lib/YaST2/bin/* +%{_prefix}/lib/YaST2/bin/* /usr/lib/YaST2/servers_non_y2/ag_* /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* diff --git a/yast2-bootloader-2.21.2.tar.bz2 b/yast2-bootloader-2.21.2.tar.bz2 index c17e476..feb6af1 100644 --- a/yast2-bootloader-2.21.2.tar.bz2 +++ b/yast2-bootloader-2.21.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afedf2e0639a37a97e4c51e557196b321ebf566bc0d4cffce4150bc622ba9b53 -size 377910 +oid sha256:5256f7bb36fb70a18b8493ad9ecf60c66963f2d2df5e8a71ce13bd478cfa68da +size 409949