Hello community, here is the log from the commit of package yast2-scanner for openSUSE:Factory checked in at 2013-02-28 07:28:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-scanner (Old) and /work/SRC/openSUSE:Factory/.yast2-scanner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-scanner", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-scanner/yast2-scanner.changes 2012-05-21 07:33:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-scanner.new/yast2-scanner.changes 2013-02-28 10:24:20.000000000 +0100 @@ -12,0 +13,5 @@ +Thu Mar 29 15:58:34 CEST 2012 - [email protected] + +- merge proofread texts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.8ftt6I/_old 2013-02-28 10:24:21.000000000 +0100 +++ /var/tmp/diff_new_pack.8ftt6I/_new 2013-02-28 10:24:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-scanner # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,16 @@ Name: yast2-scanner Version: 2.23.0 Release: 0 + BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-scanner-%{version}.tar.bz2 + +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: xorg-x11-libX11-devel BuildRequires: yast2 @@ -49,19 +56,29 @@ "sane-backends". %prep -%setup -q +%setup -n yast2-scanner-%{version} %build -make -f Makefile.cvs +%{_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 %install make install DESTDIR="$RPM_BUILD_ROOT" -%suse_update_desktop_file -d ycc_scanner scanner +[ -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 + # Exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list # which are pulled in by Autoreqprov because of the displaytest tool: cat << EOF > %{my_requires} ++++++ yast2-scanner-2.23.0.tar.bz2 ++++++ ++++ 50796 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
