Hello community,

here is the log from the commit of package yast2-printer for openSUSE:Factory 
checked in at 2012-01-17 11:36:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-printer (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-printer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-printer", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-printer/yast2-printer.changes      
2011-10-07 17:07:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-printer.new/yast2-printer.changes 
2012-01-17 16:17:50.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 12 15:45:29 UTC 2012 - [email protected]
+
+- add an explicit GPL-2.0 license to the spec file template
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.VLAj89/_old  2012-01-17 16:17:51.000000000 +0100
+++ /var/tmp/diff_new_pack.VLAj89/_new  2012-01-17 16:17:51.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-printer
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,52 +15,70 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           yast2-printer
-Summary:        YaST2 - Printer Configuration
 Version:        2.21.0
-Release:        1
-License:        GPL
-Group:          System/YaST
+Release:        0
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        %{name}-%{version}.tar.bz2
-Prefix:         /usr
-BuildRequires:  update-desktop-files xorg-x11-libX11-devel yast2 
yast2-core-devel yast2-devtools yast2-testsuite
+Source0:        yast2-printer-%{version}.tar.bz2
+
+BuildRequires:  update-desktop-files
+BuildRequires:  xorg-x11-libX11-devel
+BuildRequires:  yast2
+BuildRequires:  yast2-core-devel
+BuildRequires:  yast2-devtools
+BuildRequires:  yast2-testsuite
+
 Recommends:     cups-client iptables netcat samba-client
+
 Requires:       /bin/mktemp /bin/ping /usr/bin/sed
 Requires:       yast2 >= 2.16.12
+
 # Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires 
list
 # which are pulled in by Autoreqprov because of the basicadd_displaytest tool:
 %define my_requires /tmp/my-requires
 
-%package devel-doc
-License:        GPL
+Summary:        YaST2 - Printer Configuration
+License:        GPL-2.0
 Group:          Documentation/SUSE
-BuildRequires:  cups-devel yast2-core-devel
+
+%package devel-doc
+BuildRequires:  cups-devel
+BuildRequires:  yast2-core-devel
 Summary:        Developer documentation for yast2-printer
+Group:          Documentation/SUSE
 
 %description
 This package contains the YaST2 component for printer configuration.
 
 %description devel-doc
-This package contains the developer documentation for yast2-printer.
+Developer documentation for yast2-printer.
 
 %prep
-%setup -q
+%setup -n yast2-printer-%{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_printer printer
+[ -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 basicadd_displaytest tool:
 cat << EOF > %{my_requires}
@@ -69,41 +87,43 @@
 chmod 755 %{my_requires}
 %define __find_requires %{my_requires}
 
+%post
+
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
 %dir /usr/share/YaST2/include/printer
-%{prefix}/share/applications/YaST2/printer.desktop
+%{_prefix}/share/applications/YaST2/printer.desktop
 /usr/share/YaST2/modules/*.y*
 /usr/share/YaST2/clients/printer*
 /usr/share/YaST2/include/printer/*
 /usr/share/YaST2/schema/autoyast/rnc/printer.rnc
 /usr/share/YaST2/data/testprint.ps
 /usr/share/YaST2/data/testprint.2pages.ps
-%{prefix}/lib/YaST2/bin/autodetect_print_queues
-%{prefix}/lib/YaST2/bin/autodetect_printers
-%{prefix}/lib/YaST2/bin/create_printer_ppd_database
-%{prefix}/lib/YaST2/bin/determine_printer_driver_options
-%{prefix}/lib/YaST2/bin/cups_client_only
-%{prefix}/lib/YaST2/bin/modify_cupsd_conf
-%{prefix}/lib/YaST2/bin/test_device
-%{prefix}/lib/YaST2/bin/test_remote_ipp
-%{prefix}/lib/YaST2/bin/test_remote_lpd
-%{prefix}/lib/YaST2/bin/test_remote_novell
-%{prefix}/lib/YaST2/bin/test_remote_smb
-%{prefix}/lib/YaST2/bin/test_remote_socket
-%{prefix}/lib/YaST2/bin/basicadd_displaytest
+%{_prefix}/lib/YaST2/bin/autodetect_print_queues
+%{_prefix}/lib/YaST2/bin/autodetect_printers
+%{_prefix}/lib/YaST2/bin/create_printer_ppd_database
+%{_prefix}/lib/YaST2/bin/determine_printer_driver_options
+%{_prefix}/lib/YaST2/bin/cups_client_only
+%{_prefix}/lib/YaST2/bin/modify_cupsd_conf
+%{_prefix}/lib/YaST2/bin/test_device
+%{_prefix}/lib/YaST2/bin/test_remote_ipp
+%{_prefix}/lib/YaST2/bin/test_remote_lpd
+%{_prefix}/lib/YaST2/bin/test_remote_novell
+%{_prefix}/lib/YaST2/bin/test_remote_smb
+%{_prefix}/lib/YaST2/bin/test_remote_socket
+%{_prefix}/lib/YaST2/bin/basicadd_displaytest
 #Documentation
-%dir %{prefix}/share/doc/packages/yast2-printer
-%{prefix}/share/doc/packages/yast2-printer/COPYING
-%readme %{prefix}/share/doc/packages/yast2-printer/README
+%dir %{_prefix}/share/doc/packages/yast2-printer
+%{_prefix}/share/doc/packages/yast2-printer/COPYING
+%readme %{_prefix}/share/doc/packages/yast2-printer/README
 
 %files devel-doc
 %defattr(-,root,root)
-%doc %{prefix}/share/doc/packages/yast2-printer
-%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
-%exclude %{prefix}/share/doc/packages/yast2-printer/README
+%doc %{_prefix}/share/doc/packages/yast2-printer
+%exclude %{_prefix}/share/doc/packages/yast2-printer/COPYING
+%exclude %{_prefix}/share/doc/packages/yast2-printer/README
 
 %changelog

++++++ yast2-printer-2.21.0.tar.bz2 ++++++
++++ 20858 lines of diff (skipped)

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

Reply via email to