Mailinglist Archive: opensuse-commit (4019 mails)
| < Previous | Next > |
commit yast2-firstboot for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 21 Dec 2011 17:01:21 +0100
- Message-id: <20111221160121.1BE45202DD@hilbert.suse.de>
Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at 2011-12-21 17:01:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old)
and /work/SRC/openSUSE:Factory/.yast2-firstboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot", Maintainer is "jsuchome@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes
2011-10-04 18:01:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-firstboot.new/yast2-firstboot.changes
2011-12-21 17:01:19.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Dec 7 10:05:06 UTC 2011 - coolo@xxxxxxxx
+
+- fix license to be in spdx.org format
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.ihbwmW/_old 2011-12-21 17:01:20.000000000 +0100
+++ /var/tmp/diff_new_pack.ihbwmW/_new 2011-12-21 17:01:20.000000000 +0100
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-firstboot
Version: 2.21.2
@@ -25,11 +23,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-firstboot-%{version}.tar.bz2
-Prefix: /usr
-
-Group: System/YaST
-License: GPL v2 or later X11/MIT
-BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel
update-desktop-files yast2-devtools yast2-testsuite yast2-xml
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: libxslt
+BuildRequires: perl-XML-Writer
+BuildRequires: sgml-skel
+BuildRequires: update-desktop-files
+BuildRequires: yast2-devtools
+BuildRequires: yast2-testsuite
+BuildRequires: yast2-xml
# Internet.ycp moved to yast2.rpm
BuildRequires: yast2 >= 2.16.6
# Installation startup scripts
@@ -46,6 +47,8 @@
BuildArch: noarch
Summary: YaST2 - Initial System Configuration
+License: GPL-2.0+ ; MIT
+Group: System/YaST
PreReq: %fillup_prereq
%description
@@ -63,23 +66,23 @@
%setup -n yast2-firstboot-%{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
@@ -94,9 +97,9 @@
%files
%defattr(-,root,root)
-%dir %{prefix}/lib/YaST2/startup/Firstboot-Stage
-%{prefix}/lib/YaST2/startup/Firstboot-Stage/*
-%{prefix}/lib/YaST2/startup/YaST2.Firstboot
+%dir %{_prefix}/lib/YaST2/startup/Firstboot-Stage
+%{_prefix}/lib/YaST2/startup/Firstboot-Stage/*
+%{_prefix}/lib/YaST2/startup/YaST2.Firstboot
/usr/share/YaST2/clients/firstboot_*.ycp
/usr/share/YaST2/clients/firstboot.ycp
%dir /usr/share/YaST2/include/firstboot
@@ -105,7 +108,7 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.firstboot
/usr/share/firstboot
-%doc %{prefix}/share/doc/packages/yast2-firstboot
+%doc %{_prefix}/share/doc/packages/yast2-firstboot
/etc/YaST2/*.xml
/usr/share/autoinstall/modules/firstboot.desktop
++++++ yast2-firstboot-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-2.21.2/Makefile.am
new/yast2-firstboot-2.21.2/Makefile.am
--- old/yast2-firstboot-2.21.2/Makefile.am 2011-09-23 17:18:07.000000000
+0200
+++ new/yast2-firstboot-2.21.2/Makefile.am 2011-12-15 11:35:23.000000000
+0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-2.21.2/Makefile.in
new/yast2-firstboot-2.21.2/Makefile.in
--- old/yast2-firstboot-2.21.2/Makefile.in 2011-09-23 17:18:09.000000000
+0200
+++ new/yast2-firstboot-2.21.2/Makefile.in 2011-12-15 11:35:28.000000000
+0100
@@ -267,7 +267,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -908,7 +907,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -936,21 +935,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-2.21.2/configure.in
new/yast2-firstboot-2.21.2/configure.in
--- old/yast2-firstboot-2.21.2/configure.in 2011-09-23 17:18:07.000000000
+0200
+++ new/yast2-firstboot-2.21.2/configure.in 2011-12-15 11:35:22.000000000
+0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-firstboot
dnl
-dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-firstboot, 2.21.2, http://bugs.opensuse.org/, yast2-firstboot)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at 2011-12-21 17:01:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old)
and /work/SRC/openSUSE:Factory/.yast2-firstboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot", Maintainer is "jsuchome@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes
2011-10-04 18:01:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-firstboot.new/yast2-firstboot.changes
2011-12-21 17:01:19.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Dec 7 10:05:06 UTC 2011 - coolo@xxxxxxxx
+
+- fix license to be in spdx.org format
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.ihbwmW/_old 2011-12-21 17:01:20.000000000 +0100
+++ /var/tmp/diff_new_pack.ihbwmW/_new 2011-12-21 17:01:20.000000000 +0100
@@ -15,8 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-firstboot
Version: 2.21.2
@@ -25,11 +23,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-firstboot-%{version}.tar.bz2
-Prefix: /usr
-
-Group: System/YaST
-License: GPL v2 or later X11/MIT
-BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel
update-desktop-files yast2-devtools yast2-testsuite yast2-xml
+BuildRequires: docbook-xsl-stylesheets
+BuildRequires: libxslt
+BuildRequires: perl-XML-Writer
+BuildRequires: sgml-skel
+BuildRequires: update-desktop-files
+BuildRequires: yast2-devtools
+BuildRequires: yast2-testsuite
+BuildRequires: yast2-xml
# Internet.ycp moved to yast2.rpm
BuildRequires: yast2 >= 2.16.6
# Installation startup scripts
@@ -46,6 +47,8 @@
BuildArch: noarch
Summary: YaST2 - Initial System Configuration
+License: GPL-2.0+ ; MIT
+Group: System/YaST
PreReq: %fillup_prereq
%description
@@ -63,23 +66,23 @@
%setup -n yast2-firstboot-%{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
@@ -94,9 +97,9 @@
%files
%defattr(-,root,root)
-%dir %{prefix}/lib/YaST2/startup/Firstboot-Stage
-%{prefix}/lib/YaST2/startup/Firstboot-Stage/*
-%{prefix}/lib/YaST2/startup/YaST2.Firstboot
+%dir %{_prefix}/lib/YaST2/startup/Firstboot-Stage
+%{_prefix}/lib/YaST2/startup/Firstboot-Stage/*
+%{_prefix}/lib/YaST2/startup/YaST2.Firstboot
/usr/share/YaST2/clients/firstboot_*.ycp
/usr/share/YaST2/clients/firstboot.ycp
%dir /usr/share/YaST2/include/firstboot
@@ -105,7 +108,7 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.firstboot
/usr/share/firstboot
-%doc %{prefix}/share/doc/packages/yast2-firstboot
+%doc %{_prefix}/share/doc/packages/yast2-firstboot
/etc/YaST2/*.xml
/usr/share/autoinstall/modules/firstboot.desktop
++++++ yast2-firstboot-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-2.21.2/Makefile.am
new/yast2-firstboot-2.21.2/Makefile.am
--- old/yast2-firstboot-2.21.2/Makefile.am 2011-09-23 17:18:07.000000000
+0200
+++ new/yast2-firstboot-2.21.2/Makefile.am 2011-12-15 11:35:23.000000000
+0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-2.21.2/Makefile.in
new/yast2-firstboot-2.21.2/Makefile.in
--- old/yast2-firstboot-2.21.2/Makefile.in 2011-09-23 17:18:09.000000000
+0200
+++ new/yast2-firstboot-2.21.2/Makefile.in 2011-12-15 11:35:28.000000000
+0100
@@ -267,7 +267,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -908,7 +907,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -936,21 +935,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-2.21.2/configure.in
new/yast2-firstboot-2.21.2/configure.in
--- old/yast2-firstboot-2.21.2/configure.in 2011-09-23 17:18:07.000000000
+0200
+++ new/yast2-firstboot-2.21.2/configure.in 2011-12-15 11:35:22.000000000
+0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-firstboot
dnl
-dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-firstboot, 2.21.2, http://bugs.opensuse.org/, yast2-firstboot)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |