Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package skelcd-control-openSUSE for
openSUSE:Factory checked in at 2023-05-13 17:17:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Sat May 13 17:17:08 2023 rev:236 rq:1086715 version:20230512.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE.changes
2023-01-28 20:09:22.446444005 +0100
+++
/work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.1533/skelcd-control-openSUSE.changes
2023-05-13 17:17:16.514254753 +0200
@@ -1,0 +2,15 @@
+Fri May 12 08:50:48 UTC 2023 - Ladislav Slezák <[email protected]>
+
+- Fix up for the previous update: xsltproc tool is still needed
+ for building on some architectures
+- 20230512.1
+
+-------------------------------------------------------------------
+Fri May 12 07:45:59 UTC 2023 - Ladislav Slezák <[email protected]>
+
+- Drop the *-promo subpackage (not used anymore and we would have
+ to switch it to _multibuild to use it further, related to
+ bsc#1211319)
+- 20230512
+
+-------------------------------------------------------------------
Old:
----
README.md
pre_checkin.sh
skelcd-control-openSUSE-20230126.tar.bz2
skelcd-control-openSUSE-promo.changes
skelcd-control-openSUSE-promo.spec
New:
----
skelcd-control-openSUSE-20230512.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.KdMCjA/_old 2023-05-13 17:17:17.142258366 +0200
+++ /var/tmp/diff_new_pack.KdMCjA/_new 2023-05-13 17:17:17.150258412 +0200
@@ -27,15 +27,13 @@
#
######################################################################
Name: skelcd-control-openSUSE
-Version: 20230126
+Version: 20230512.1
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
Group: Metapackages
URL: https://github.com/yast/skelcd-control-openSUSE
Source: skelcd-control-openSUSE-%{version}.tar.bz2
-# we do not distribute it, but need to have it here, otherwise build service
checks complain
-Source99: README.md
# xmllint
BuildRequires: libxml2-tools
# xsltproc
@@ -119,11 +117,7 @@
#
# Add control file
#
-%if "%{name}" == "skelcd-control-openSUSE-promo"
- CONTROL_FILE=control.openSUSE-promo.xml
-%else
- CONTROL_FILE=control.openSUSE.xml
-%endif
+CONTROL_FILE=control.openSUSE.xml
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
install -m 644 control/${CONTROL_FILE}
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
++++++ skelcd-control-openSUSE-20230126.tar.bz2 ->
skelcd-control-openSUSE-20230512.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-openSUSE-20230126/.ci.sh
new/skelcd-control-openSUSE-20230512.1/.ci.sh
--- old/skelcd-control-openSUSE-20230126/.ci.sh 2023-01-27 15:38:46.000000000
+0100
+++ new/skelcd-control-openSUSE-20230512.1/.ci.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#! /bin/bash
-
-set -e -x
-
-make -C control check
-
-# the "yast-travis-ruby" script is included in the base yastdevel/ruby image
-# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
-yast-travis-ruby
-
-# explicitly check the changelog sequence, the source_validator is fine if at
least one
-# *.changes file is OK, but here we need to be sure that both are correct
-/usr/lib/obs/service/source_validators/helpers/convert_changes_to_rpm_changelog
--check < package/skelcd-control-openSUSE.changes
-/usr/lib/obs/service/source_validators/helpers/convert_changes_to_rpm_changelog
--check < package/skelcd-control-openSUSE-promo.changes
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-20230126/.github/workflows/ci.yml
new/skelcd-control-openSUSE-20230512.1/.github/workflows/ci.yml
--- old/skelcd-control-openSUSE-20230126/.github/workflows/ci.yml
2023-01-27 15:38:46.000000000 +0100
+++ new/skelcd-control-openSUSE-20230512.1/.github/workflows/ci.yml
2023-05-12 11:48:52.000000000 +0200
@@ -27,5 +27,8 @@
- name: POT Check
run: rake check:pot
- - name: CI checks
- run: sh .ci.sh
+ - name: Validate XML
+ run: make -C control check
+
+ - name: Package Build
+ run: yast-ci-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-openSUSE-20230126/Rakefile
new/skelcd-control-openSUSE-20230512.1/Rakefile
--- old/skelcd-control-openSUSE-20230126/Rakefile 2023-01-27
15:38:46.000000000 +0100
+++ new/skelcd-control-openSUSE-20230512.1/Rakefile 2023-05-12
11:48:52.000000000 +0200
@@ -6,16 +6,6 @@
conf.exclude_files << /README.md/ #do not pack readme
end
-desc "Generate *-promo package files"
-task :create_promo do
- Dir.chdir("package") do
- sh "./pre_checkin.sh"
- end
-end
-
-# generate the *-promo files when creating the tarball
-task :tarball => :create_promo
-
# this package uses the date versioning in master (for openSUSE Tumbleweed),
# replace the standard yast task implementation
Rake::Task[:'version:bump'].clear
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-openSUSE-20230126/control/Makefile
new/skelcd-control-openSUSE-20230512.1/control/Makefile
--- old/skelcd-control-openSUSE-20230126/control/Makefile 2023-01-27
15:38:46.000000000 +0100
+++ new/skelcd-control-openSUSE-20230512.1/control/Makefile 2023-05-12
11:48:52.000000000 +0200
@@ -1,12 +1,5 @@
-# generate the control.openSUSE-promo.xml control file
-control.openSUSE-promo.xml: control.openSUSE-promo.xsl
control.openSUSE-promo.changes.xml control.openSUSE.xml
- xsltproc control.openSUSE-promo.xsl control.openSUSE.xml >
control.openSUSE-promo.xml
-
# checks only those control files that belong to this package
-check: control.openSUSE-promo.xml
+check:
xmllint --relaxng /usr/share/YaST2/control/control.rng --noout *.xml
-clean:
- rm -f control.openSUSE-promo.xml
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-20230126/control/control.openSUSE-promo.changes.xml
new/skelcd-control-openSUSE-20230512.1/control/control.openSUSE-promo.changes.xml
---
old/skelcd-control-openSUSE-20230126/control/control.openSUSE-promo.changes.xml
2023-01-27 15:38:46.000000000 +0100
+++
new/skelcd-control-openSUSE-20230512.1/control/control.openSUSE-promo.changes.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<productDefines xmlns="http://www.suse.com/1.0/yast2ns";
- xmlns:config="http://www.suse.com/1.0/configns";>
-
- <software>
- <products_supported_for_upgrade config:type="list">
- <!-- basically warn everywhere -->
- <regexp_item>^openSUSE-Promo</regexp_item>
- </products_supported_for_upgrade>
- </software>
-
-</productDefines>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-20230126/control/control.openSUSE-promo.xsl
new/skelcd-control-openSUSE-20230512.1/control/control.openSUSE-promo.xsl
--- old/skelcd-control-openSUSE-20230126/control/control.openSUSE-promo.xsl
2023-01-27 15:38:46.000000000 +0100
+++ new/skelcd-control-openSUSE-20230512.1/control/control.openSUSE-promo.xsl
1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-<!--
- Definition of the control.openSUSE.xml -> control.openSUSE-promo.xml
transformation.
- Replace the <products_supported_for_upgrade> node by definition from
- control.openSUSE-promo.changes.xml file
--->
-<xsl:stylesheet version="1.0"
- xmlns:n="http://www.suse.com/1.0/yast2ns";
- xmlns:config="http://www.suse.com/1.0/configns";
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-
-<xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="node()|@*">
- <xsl:copy>
- <xsl:apply-templates select="node()|@*"/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="n:products_supported_for_upgrade">
- <xsl:copy-of
select="document('control.openSUSE-promo.changes.xml')/*/*/n:products_supported_for_upgrade"/>
- </xsl:template>
-</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-20230126/package/pre_checkin.sh
new/skelcd-control-openSUSE-20230512.1/package/pre_checkin.sh
--- old/skelcd-control-openSUSE-20230126/package/pre_checkin.sh 2023-01-27
15:38:46.000000000 +0100
+++ new/skelcd-control-openSUSE-20230512.1/package/pre_checkin.sh
1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-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
-
-# this does not work in the Git checkout, osc checkout is needed
-if [ -e .osc ]; then
- osc service localrun format_spec_file
-fi
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-20230126/package/skelcd-control-openSUSE.changes
new/skelcd-control-openSUSE-20230512.1/package/skelcd-control-openSUSE.changes
---
old/skelcd-control-openSUSE-20230126/package/skelcd-control-openSUSE.changes
2023-01-27 15:38:46.000000000 +0100
+++
new/skelcd-control-openSUSE-20230512.1/package/skelcd-control-openSUSE.changes
2023-05-12 11:48:52.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri May 12 08:50:48 UTC 2023 - Ladislav Slezák <[email protected]>
+
+- Fix up for the previous update: xsltproc tool is still needed
+ for building on some architectures
+- 20230512.1
+
+-------------------------------------------------------------------
+Fri May 12 07:45:59 UTC 2023 - Ladislav Slezák <[email protected]>
+
+- Drop the *-promo subpackage (not used anymore and we would have
+ to switch it to _multibuild to use it further, related to
+ bsc#1211319)
+- 20230512
+
+-------------------------------------------------------------------
Thu Jan 26 10:24:00 UTC 2023 - Lubos Kocman <[email protected]>
- Use http:// for openh264 as the redirection target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-20230126/package/skelcd-control-openSUSE.spec
new/skelcd-control-openSUSE-20230512.1/package/skelcd-control-openSUSE.spec
--- old/skelcd-control-openSUSE-20230126/package/skelcd-control-openSUSE.spec
2023-01-27 15:38:46.000000000 +0100
+++ new/skelcd-control-openSUSE-20230512.1/package/skelcd-control-openSUSE.spec
2023-05-12 11:48:52.000000000 +0200
@@ -27,15 +27,13 @@
#
######################################################################
Name: skelcd-control-openSUSE
-Version: 20230126
+Version: 20230512.1
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
Group: Metapackages
Url: https://github.com/yast/skelcd-control-openSUSE
Source: skelcd-control-openSUSE-%{version}.tar.bz2
-# we do not distribute it, but need to have it here, otherwise build service
checks complain
-Source99: README.md
# xmllint
BuildRequires: libxml2-tools
# xsltproc
@@ -119,11 +117,7 @@
#
# Add control file
#
-%if "%{name}" == "skelcd-control-openSUSE-promo"
- CONTROL_FILE=control.openSUSE-promo.xml
-%else
- CONTROL_FILE=control.openSUSE.xml
-%endif
+CONTROL_FILE=control.openSUSE.xml
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
install -m 644 control/${CONTROL_FILE}
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
