Hello community,
here is the log from the commit of package skelcd-control-openSUSE for
openSUSE:Factory checked in at 2014-01-14 20:01:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes
2013-12-31 16:47:37.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes
2014-01-14 20:01:28.000000000 +0100
@@ -1,0 +2,16 @@
+Mon Jan 13 10:07:03 UTC 2014 - [email protected]
+
+- add clone client that handle autoyast cloning settings
+ (FATE#308539)
+- version 13.2.2
+
+-------------------------------------------------------------------
+Thu Jan 9 08:14:22 UTC 2014 - [email protected]
+
+- the package is maintained now at Yast GitHub repository
+ (https://github.com/yast/skelcd-control-openSUSE)
+- changed versioning schema to 13.2.x (distribution release
+ prefix), magic get_version_number.sh script has been removed
+- version 13.2.1
+
+-------------------------------------------------------------------
skelcd-control-openSUSE.changes: same change
Old:
----
control.promo.diff
control.xml
get_version_number.sh
New:
----
README.md
skelcd-control-openSUSE-13.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
--- /var/tmp/diff_new_pack.Be0DQg/_old 2014-01-14 20:01:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Be0DQg/_new 2014-01-14 20:01:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE-promo
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,46 +17,62 @@
Name: skelcd-control-openSUSE-promo
-BuildRequires: libxml2
+# xmllint
+BuildRequires: libxml2-tools
+# xsltproc
+BuildRequires: libxslt-tools
+# RNG schema
BuildRequires: yast2-installation-control
-Url: http://www.suse.com/
+
+Url: https://github.com/yast/skelcd-control-openSUSE
AutoReqProv: off
-Version: 2013.12.10
+Version: 13.2.2
Release: 0
-Summary: SuSE Linux Professional Control file
+Summary: The openSUSE Installation Control file
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: control.xml
-Source1: control.promo.diff
+Source: skelcd-control-openSUSE-%version.tar.bz2
Provides: product_control
Conflicts: product_control
+# NOTE: Do not patch the control file in OBS, fork
+# https://github.com/yast/skelcd-control-openSUSE instead and create a pull
+# request. The package is autosubmitted from Git by Jenkins CI
+# (http://ci.opensuse.org/view/Yast/)
+
%description
-Control file for installation
+This package contains the control file used for openSUSE installation.
%prep
+%setup -n skelcd-control-openSUSE-%{version}
+
%build
+make -C control
+
+%check
+make -C control check
%install
#
# Add control file
#
mkdir -p $RPM_BUILD_ROOT/CD1
-#
-# Verify syntax
-#
-install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml
+
%if "%{name}" == "skelcd-control-openSUSE-promo"
-patch $RPM_BUILD_ROOT/CD1/control.xml %{SOURCE1}
+CONTROL_FILE=control.openSUSE-promo.xml
+%else
+CONTROL_FILE=control.openSUSE.xml
%endif
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
+
+install -m 644 control/$CONTROL_FILE $RPM_BUILD_ROOT/CD1/control.xml
+
%ifarch ppc ppc64
sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/ppc/distribution/,";
$RPM_BUILD_ROOT/CD1/control.xml
sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/ppc/debug/,";
$RPM_BUILD_ROOT/CD1/control.xml
sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/ppc/source/,";
$RPM_BUILD_ROOT/CD1/control.xml
-diff -u %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml || true
+xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
%endif
%files
++++++ skelcd-control-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.Be0DQg/_old 2014-01-14 20:01:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Be0DQg/_new 2014-01-14 20:01:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,46 +17,62 @@
Name: skelcd-control-openSUSE
-BuildRequires: libxml2
+# xmllint
+BuildRequires: libxml2-tools
+# xsltproc
+BuildRequires: libxslt-tools
+# RNG schema
BuildRequires: yast2-installation-control
-Url: http://www.suse.com/
+
+Url: https://github.com/yast/skelcd-control-openSUSE
AutoReqProv: off
-Version: 2013.12.10
+Version: 13.2.2
Release: 0
-Summary: SuSE Linux Professional Control file
+Summary: The openSUSE Installation Control file
License: MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: control.xml
-Source1: control.promo.diff
+Source: skelcd-control-openSUSE-%version.tar.bz2
Provides: product_control
Conflicts: product_control
+# NOTE: Do not patch the control file in OBS, fork
+# https://github.com/yast/skelcd-control-openSUSE instead and create a pull
+# request. The package is autosubmitted from Git by Jenkins CI
+# (http://ci.opensuse.org/view/Yast/)
+
%description
-Control file for installation
+This package contains the control file used for openSUSE installation.
%prep
+%setup -n skelcd-control-openSUSE-%{version}
+
%build
+make -C control
+
+%check
+make -C control check
%install
#
# Add control file
#
mkdir -p $RPM_BUILD_ROOT/CD1
-#
-# Verify syntax
-#
-install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml
+
%if "%{name}" == "skelcd-control-openSUSE-promo"
-patch $RPM_BUILD_ROOT/CD1/control.xml %{SOURCE1}
+CONTROL_FILE=control.openSUSE-promo.xml
+%else
+CONTROL_FILE=control.openSUSE.xml
%endif
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
+
+install -m 644 control/$CONTROL_FILE $RPM_BUILD_ROOT/CD1/control.xml
+
%ifarch ppc ppc64
sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/ppc/distribution/,";
$RPM_BUILD_ROOT/CD1/control.xml
sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/ppc/debug/,";
$RPM_BUILD_ROOT/CD1/control.xml
sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/ppc/source/,";
$RPM_BUILD_ROOT/CD1/control.xml
-diff -u %{SOURCE0} $RPM_BUILD_ROOT/CD1/control.xml || true
+xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
%endif
%files
++++++ README.md ++++++
NOTE
----
The `*-openSUSE-promo.*` files are created automatically when the package is
submitted to OBS (done in the `rake tarball` task).
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.Be0DQg/_old 2014-01-14 20:01:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Be0DQg/_new 2014-01-14 20:01:28.000000000 +0100
@@ -3,5 +3,8 @@
cp skelcd-control-openSUSE.changes skelcd-control-openSUSE-promo.changes
sed -e 's,^Name.*,Name: skelcd-control-openSUSE-promo,'
skelcd-control-openSUSE.spec > skelcd-control-openSUSE-promo.spec
-osc service localrun format_spec_file
+# this does not work in the Git checkout, osc checkout is needed
+if [ -e .osc ]; then
+ osc service localrun format_spec_file
+fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
