Hello community,

here is the log from the commit of package yast2-scanner for openSUSE:Factory 
checked in at 2011-12-22 10:54:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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      
2011-09-23 12:53:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-scanner.new/yast2-scanner.changes 
2011-12-22 10:54:53.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Dec 16 08:49:24 UTC 2011 - [email protected]
+
+- it's actually GPL 2.0 only
+
+-------------------------------------------------------------------
+Fri Nov 25 12:24:56 UTC 2011 - [email protected]
+
+- add libtool as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Fri Aug  5 12:35:01 CEST 2011 - [email protected]
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------

Old:
----
  yast2-scanner-2.20.1.tar.bz2

New:
----
  yast2-scanner-2.20.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.qzUWUj/_old  2011-12-22 10:54:53.000000000 +0100
+++ /var/tmp/diff_new_pack.qzUWUj/_new  2011-12-22 10:54:53.000000000 +0100
@@ -15,24 +15,34 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           yast2-scanner
-Summary:        YaST2 - Scanner Configuration
-Version:        2.20.1
-Release:        1
-License:        GPL
-Group:          System/YaST
+Version:        2.20.2
+Release:        0
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        %{name}-%{version}.tar.bz2
-Prefix:         /usr
-BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer 
sgml-skel update-desktop-files xorg-x11-libX11-devel yast2 yast2-devtools 
yast2-testsuite
+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
+BuildRequires:  yast2-devtools
+BuildRequires:  yast2-testsuite
 Requires:       yast2
 # Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires 
list
 # which are pulled in by Autoreqprov because of the displaytest tool:
 %define my_requires /tmp/my-requires
 
+Summary:        YaST2 - Scanner Configuration
+License:        GPL-2.0
+Group:          System/YaST
+
 %description
 This package provides support for the configuration of USB scanners,
 SCSI scanners, scanners in HP all-in-one devices, and scanning via
@@ -46,19 +56,30 @@
 "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"
+
+%{?suse_update_config:%{suse_update_config -f}}
+./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}
@@ -76,9 +97,9 @@
 /usr/share/YaST2/include/scanner/*
 /usr/share/YaST2/clients/scanner.ycp
 /usr/share/YaST2/modules/Scanner.*
-%{prefix}/share/applications/YaST2/scanner.desktop
-%{prefix}/lib/YaST2/bin/*scanner*
-%{prefix}/lib/YaST2/bin/displaytest
-%doc %{prefix}/share/doc/packages/yast2-scanner
+%{_prefix}/share/applications/YaST2/scanner.desktop
+%{_prefix}/lib/YaST2/bin/*scanner*
+%{_prefix}/lib/YaST2/bin/displaytest
+%doc %{_prefix}/share/doc/packages/yast2-scanner
 
 %changelog

++++++ yast2-scanner-2.20.1.tar.bz2 -> yast2-scanner-2.20.2.tar.bz2 ++++++
++++ 49957 lines of diff (skipped)

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to