Hello community,

here is the log from the commit of package skelcd-control-openSUSE for 
openSUSE:Factory checked in at 2019-03-28 22:47:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
 and      /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "skelcd-control-openSUSE"

Thu Mar 28 22:47:10 2019 rev:204 rq:689357 version:20190326

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes
    2019-03-21 09:51:08.666823836 +0100
+++ 
/work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.25356/skelcd-control-openSUSE-promo.changes
 2019-03-28 22:47:11.883070290 +0100
@@ -0,0 +1,12 @@
+------------------------------------------------------------------
+Mon Mar 25 11:13:31 UTC 2019 - Dirk Mueller <[email protected]>
+
+- Fix update repository for ports (forward port of change that
+  went into Leap 15.0) (bsc#1101334)
+- 20190325
+
+-------------------------------------------------------------------
+Mon Mar 25 10:26:35 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Fix %arm links (boo#1130382)
+
@@ -5,0 +18,8 @@
+
+-------------------------------------------------------------------
+Tue Mar 12 11:55:40 UTC 2019 - Dominique Leuenberger <[email protected]>
+
+- Default to wicked on generic desktop: do the same as we did
+  before yast learned to auto-pick NetworkManager if the
+  control.xml happened to request it (bsc#1127228).
+- 20190326
skelcd-control-openSUSE.changes: same change

Old:
----
  skelcd-control-openSUSE-20190312.tar.bz2

New:
----
  skelcd-control-openSUSE-20190326.tar.bz2

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

Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
--- /var/tmp/diff_new_pack.MgqRfx/_old  2019-03-28 22:47:13.331070070 +0100
+++ /var/tmp/diff_new_pack.MgqRfx/_new  2019-03-28 22:47:13.335070069 +0100
@@ -27,7 +27,7 @@
 #
 ######################################################################
 Name:           skelcd-control-openSUSE-promo
-Version:        20190312
+Version:        20190326
 Release:        0
 Summary:        The openSUSE Installation Control file
 License:        MIT
@@ -122,15 +122,21 @@
 install -m 644 control/${CONTROL_FILE} 
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
 
 %ifarch aarch64 %arm ppc ppc64 ppc64le
+    ports_arch="%{_arch}"
     %ifarch ppc ppc64 ppc64le
         ports_arch="ppc"
-    %else
-        ports_arch="%{_arch}"
+    %endif
+    %ifarch armv6l armv6hl
+        ports_arch="armv6hl"
+    %endif
+    %ifarch armv7l armv7hl
+        ports_arch="armv7hl"
     %endif
     sed -i -e 
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
+    sed -i -e 
"s,http://download.opensuse.org/update/leap/,http://download.opensuse.org/ports/update/leap/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     #we parse out non existing non-oss repo for ports
     xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control_ports.xml 
control/nonoss.xsl %{buildroot}%{?skelcdpath}/CD1/control.xml

skelcd-control-openSUSE.spec: same change
++++++ skelcd-control-openSUSE-20190312.tar.bz2 -> 
skelcd-control-openSUSE-20190326.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/skelcd-control-openSUSE-20190312/.github/pull_request_template.md 
new/skelcd-control-openSUSE-20190326/.github/pull_request_template.md
--- old/skelcd-control-openSUSE-20190312/.github/pull_request_template.md       
1970-01-01 01:00:00.000000000 +0100
+++ new/skelcd-control-openSUSE-20190326/.github/pull_request_template.md       
2019-03-28 14:18:13.000000000 +0100
@@ -0,0 +1,6 @@
+Note for the pull request authors:
+
+The `master` branch is intended for the openSUSE Tumbleweed only,
+if you want to have the same change in the openSUSE Leap then backport
+it to the respective `openSUSE-X_Y` branch.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/skelcd-control-openSUSE-20190312/control/control.openSUSE.xml 
new/skelcd-control-openSUSE-20190326/control/control.openSUSE.xml
--- old/skelcd-control-openSUSE-20190312/control/control.openSUSE.xml   
2019-03-13 09:05:26.000000000 +0100
+++ new/skelcd-control-openSUSE-20190326/control/control.openSUSE.xml   
2019-03-28 14:18:13.000000000 +0100
@@ -340,9 +340,6 @@
 
       <system_role>
         <id>generic_desktop</id>
-        <network>
-          <network_manager>always</network_manager>
-        </network>
         <software>
           <default_patterns>x11 base</default_patterns>
         </software>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/skelcd-control-openSUSE-20190312/package/skelcd-control-openSUSE.changes 
new/skelcd-control-openSUSE-20190326/package/skelcd-control-openSUSE.changes
--- 
old/skelcd-control-openSUSE-20190312/package/skelcd-control-openSUSE.changes    
    2019-03-13 09:05:26.000000000 +0100
+++ 
new/skelcd-control-openSUSE-20190326/package/skelcd-control-openSUSE.changes    
    2019-03-28 14:18:13.000000000 +0100
@@ -1,3 +1,15 @@
+------------------------------------------------------------------
+Mon Mar 25 11:13:31 UTC 2019 - Dirk Mueller <[email protected]>
+
+- Fix update repository for ports (forward port of change that
+  went into Leap 15.0) (bsc#1101334)
+- 20190325
+
+-------------------------------------------------------------------
+Mon Mar 25 10:26:35 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Fix %arm links (boo#1130382)
+
 -------------------------------------------------------------------
 Tue Mar 12 14:32:04 UTC 2019 - Dominique Leuenberger <[email protected]>
 
@@ -5,6 +17,14 @@
   after discussion, FATE#324053
 
 -------------------------------------------------------------------
+Tue Mar 12 11:55:40 UTC 2019 - Dominique Leuenberger <[email protected]>
+
+- Default to wicked on generic desktop: do the same as we did
+  before yast learned to auto-pick NetworkManager if the
+  control.xml happened to request it (bsc#1127228).
+- 20190326
+
+-------------------------------------------------------------------
 Tue Mar 12 11:42:39 UTC 2019 - Dominique Leuenberger <[email protected]>
 
 - Changed product_license_dir define from /etc/YaST2/licenses/base/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/skelcd-control-openSUSE-20190312/package/skelcd-control-openSUSE.spec 
new/skelcd-control-openSUSE-20190326/package/skelcd-control-openSUSE.spec
--- old/skelcd-control-openSUSE-20190312/package/skelcd-control-openSUSE.spec   
2019-03-13 09:05:26.000000000 +0100
+++ new/skelcd-control-openSUSE-20190326/package/skelcd-control-openSUSE.spec   
2019-03-28 14:18:13.000000000 +0100
@@ -27,7 +27,7 @@
 #
 ######################################################################
 Name:           skelcd-control-openSUSE
-Version:        20190312
+Version:        20190326
 Release:        0
 Summary:        The openSUSE Installation Control file
 License:        MIT
@@ -122,15 +122,21 @@
 install -m 644 control/${CONTROL_FILE} 
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
 
 %ifarch aarch64 %arm ppc ppc64 ppc64le
+    ports_arch="%{_arch}"
     %ifarch ppc ppc64 ppc64le
         ports_arch="ppc"
-    %else
-        ports_arch="%{_arch}"
+    %endif
+    %ifarch armv6l armv6hl
+        ports_arch="armv6hl"
+    %endif
+    %ifarch armv7l armv7hl
+        ports_arch="armv7hl"
     %endif
     sed -i -e 
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
+    sed -i -e 
"s,http://download.opensuse.org/update/leap/,http://download.opensuse.org/ports/update/leap/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     sed -i -e 
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
 %{buildroot}%{?skelcdpath}/CD1/control.xml
     #we parse out non existing non-oss repo for ports
     xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control_ports.xml 
control/nonoss.xsl %{buildroot}%{?skelcdpath}/CD1/control.xml


Reply via email to