Hello community,
here is the log from the commit of package skelcd-control-openSUSE for
openSUSE:Factory checked in at 2015-10-17 16:38:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-05-11 19:47:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes
2015-10-17 16:38:51.000000000 +0200
@@ -1,0 +2,22 @@
+Fri Oct 16 07:43:15 UTC 2015 - dmuel...@suse.com
+
+- add emergency update channel for the tumbleweed ports
+- 13.2.24
+
+-------------------------------------------------------------------
+Tue Sep 29 09:27:24 UTC 2015 - jreidin...@suse.com
+
+- The e17 pattern was renamed to enlightenment a while back, adapt
+ the Display manager dialog to this change
+ by Simon Lees <si...@simotek.net>
+- 13.2.23
+
+-------------------------------------------------------------------
+Wed Sep 23 10:29:37 UTC 2015 - sndir...@suse.com
+
+- use empty string as DISPLAYMANAGER for minimal+X11 and textmode
+ pattern, which on the system already results in chosing xdm as
+ default DM; this enables us to set displaymanager in %post of
+ the appropriated DM package (FATE#319432)
+
+-------------------------------------------------------------------
skelcd-control-openSUSE.changes: same change
Old:
----
skelcd-control-openSUSE-13.2.22.tar.bz2
New:
----
skelcd-control-openSUSE-13.2.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
--- /var/tmp/diff_new_pack.vj0azi/_old 2015-10-17 16:38:52.000000000 +0200
+++ /var/tmp/diff_new_pack.vj0azi/_new 2015-10-17 16:38:52.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE-promo
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,22 +26,30 @@
# for more details.
#
######################################################################
-
Name: skelcd-control-openSUSE-promo
+Version: 13.2.24
+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
BuildRequires: libxslt-tools
# RNG schema
BuildRequires: yast2-installation-control >= 3.1.7
-
######################################################################
#
# Here is the list of Yast packages which are needed in the
# installation system (inst-sys) for the Yast installer
#
-
# Generic Yast packages needed for the installer
+#
+######################################################################
Requires: autoyast2
Requires: yast2-add-on
Requires: yast2-fcoe-client
@@ -54,77 +62,66 @@
Requires: yast2-nfs-client
Requires: yast2-ntp-client
Requires: yast2-proxy
+# this is the default theme
+Requires: yast2-qt-branding-openSUSE
Requires: yast2-services-manager
Requires: yast2-slp
+Requires: yast2-theme-openSUSE-Oxygen
Requires: yast2-trans-stats
Requires: yast2-tune
Requires: yast2-update
Requires: yast2-users
Requires: yast2-x11
-# this is the default theme
-Requires: yast2-qt-branding-openSUSE
-Requires: yast2-theme-openSUSE-Oxygen
-
+Conflicts: product_control
+Provides: product_control
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Architecture specific packages
-#
-
%ifarch %ix86 x86_64
Requires: yast2-vm
%endif
-#
-######################################################################
-
-Url: https://github.com/yast/skelcd-control-openSUSE
-AutoReqProv: off
-Version: 13.2.22
-Release: 0
-Summary: The openSUSE Installation Control file
-License: MIT
-Group: Metapackages
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-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
-Provides: product_control
-Conflicts: product_control
-
%description
This package contains the control file used for openSUSE installation.
%prep
-%setup -n skelcd-control-openSUSE-%{version}
+%setup -q -n skelcd-control-openSUSE-%{version}
%build
-make -C control
+make %{?_smp_mflags} -C control
%check
-make -C control check
+make %{?_smp_mflags} -C control check
%install
#
# Add control file
#
-mkdir -p $RPM_BUILD_ROOT/CD1
+mkdir -p %{buildroot}/CD1
%if "%{name}" == "skelcd-control-openSUSE-promo"
-CONTROL_FILE=control.openSUSE-promo.xml
+ CONTROL_FILE=control.openSUSE-promo.xml
%else
-CONTROL_FILE=control.openSUSE.xml
+ CONTROL_FILE=control.openSUSE.xml
%endif
-install -m 644 control/$CONTROL_FILE $RPM_BUILD_ROOT/CD1/control.xml
+install -m 644 control/$CONTROL_FILE %{buildroot}/CD1/control.xml
-%ifarch ppc ppc64 ppc64le
-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/tumbleweed/,http://download.opensuse.org/ports/ppc/tumbleweed/,";
$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
-#we parse out non existing non-oss repo for Power
-xsltproc -o $RPM_BUILD_ROOT/CD1/control_ppc.xml control/nonoss.xsl
$RPM_BUILD_ROOT/CD1/control.xml
-mv $RPM_BUILD_ROOT/CD1/control{_ppc,}.xml
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
+%ifarch aarch64 %arm ppc ppc64 ppc64le
+ %ifarch ppc ppc64 ppc64le
+ ports_arch="ppc"
+ %else
+ ports_arch="%{_arch}"
+ %endif
+ sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ #we parse out non existing non-oss repo for ports
+ xsltproc -o %{buildroot}/CD1/control_ports.xml control/nonoss.xsl
%{buildroot}/CD1/control.xml
+ mv %{buildroot}/CD1/control{_ports,}.xml
+ xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}/CD1/control.xml
%endif
%files
++++++ skelcd-control-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.vj0azi/_old 2015-10-17 16:38:52.000000000 +0200
+++ /var/tmp/diff_new_pack.vj0azi/_new 2015-10-17 16:38:52.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,22 +26,30 @@
# for more details.
#
######################################################################
-
Name: skelcd-control-openSUSE
+Version: 13.2.24
+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
BuildRequires: libxslt-tools
# RNG schema
BuildRequires: yast2-installation-control >= 3.1.7
-
######################################################################
#
# Here is the list of Yast packages which are needed in the
# installation system (inst-sys) for the Yast installer
#
-
# Generic Yast packages needed for the installer
+#
+######################################################################
Requires: autoyast2
Requires: yast2-add-on
Requires: yast2-fcoe-client
@@ -54,77 +62,66 @@
Requires: yast2-nfs-client
Requires: yast2-ntp-client
Requires: yast2-proxy
+# this is the default theme
+Requires: yast2-qt-branding-openSUSE
Requires: yast2-services-manager
Requires: yast2-slp
+Requires: yast2-theme-openSUSE-Oxygen
Requires: yast2-trans-stats
Requires: yast2-tune
Requires: yast2-update
Requires: yast2-users
Requires: yast2-x11
-# this is the default theme
-Requires: yast2-qt-branding-openSUSE
-Requires: yast2-theme-openSUSE-Oxygen
-
+Conflicts: product_control
+Provides: product_control
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Architecture specific packages
-#
-
%ifarch %ix86 x86_64
Requires: yast2-vm
%endif
-#
-######################################################################
-
-Url: https://github.com/yast/skelcd-control-openSUSE
-AutoReqProv: off
-Version: 13.2.22
-Release: 0
-Summary: The openSUSE Installation Control file
-License: MIT
-Group: Metapackages
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-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
-Provides: product_control
-Conflicts: product_control
-
%description
This package contains the control file used for openSUSE installation.
%prep
-%setup -n skelcd-control-openSUSE-%{version}
+%setup -q -n skelcd-control-openSUSE-%{version}
%build
-make -C control
+make %{?_smp_mflags} -C control
%check
-make -C control check
+make %{?_smp_mflags} -C control check
%install
#
# Add control file
#
-mkdir -p $RPM_BUILD_ROOT/CD1
+mkdir -p %{buildroot}/CD1
%if "%{name}" == "skelcd-control-openSUSE-promo"
-CONTROL_FILE=control.openSUSE-promo.xml
+ CONTROL_FILE=control.openSUSE-promo.xml
%else
-CONTROL_FILE=control.openSUSE.xml
+ CONTROL_FILE=control.openSUSE.xml
%endif
-install -m 644 control/$CONTROL_FILE $RPM_BUILD_ROOT/CD1/control.xml
+install -m 644 control/$CONTROL_FILE %{buildroot}/CD1/control.xml
-%ifarch ppc ppc64 ppc64le
-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/tumbleweed/,http://download.opensuse.org/ports/ppc/tumbleweed/,";
$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
-#we parse out non existing non-oss repo for Power
-xsltproc -o $RPM_BUILD_ROOT/CD1/control_ppc.xml control/nonoss.xsl
$RPM_BUILD_ROOT/CD1/control.xml
-mv $RPM_BUILD_ROOT/CD1/control{_ppc,}.xml
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
+%ifarch aarch64 %arm ppc ppc64 ppc64le
+ %ifarch ppc ppc64 ppc64le
+ ports_arch="ppc"
+ %else
+ ports_arch="%{_arch}"
+ %endif
+ sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ #we parse out non existing non-oss repo for ports
+ xsltproc -o %{buildroot}/CD1/control_ports.xml control/nonoss.xsl
%{buildroot}/CD1/control.xml
+ mv %{buildroot}/CD1/control{_ports,}.xml
+ xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}/CD1/control.xml
%endif
%files
++++++ skelcd-control-openSUSE-13.2.22.tar.bz2 ->
skelcd-control-openSUSE-13.2.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-13.2.22/control/control.openSUSE.xml
new/skelcd-control-openSUSE-13.2.24/control/control.openSUSE.xml
--- old/skelcd-control-openSUSE-13.2.22/control/control.openSUSE.xml
2015-05-07 09:57:08.000000000 +0200
+++ new/skelcd-control-openSUSE-13.2.24/control/control.openSUSE.xml
2015-10-09 08:52:11.000000000 +0200
@@ -208,6 +208,18 @@
</one_supported_desktop>
<one_supported_desktop>
+ <name>server</name>
+ <desktop>icewm</desktop>
+ <label_id>desktop_server</label_id>
+ <logon>xdm</logon>
+ <cursor>DMZ</cursor>
+ <packages></packages>
+ <order config:type="integer">1</order>
+ <patterns>generic_server</patterns>
+ <icon>yast-ssh-server</icon>
+ </one_supported_desktop>
+
+ <one_supported_desktop>
<name>xfce</name>
<!-- BNC #667408 -->
<desktop>xfce</desktop>
@@ -238,7 +250,7 @@
<name>min_x</name>
<desktop>twm</desktop>
<label_id>desktop_min_x</label_id>
- <logon>xdm</logon>
+ <logon></logon>
<cursor>DMZ</cursor>
<packages>xorg-x11-server branding-openSUSE</packages>
<order config:type="integer">6</order>
@@ -247,27 +259,27 @@
</one_supported_desktop>
<one_supported_desktop>
- <name>e17</name>
- <desktop>e17</desktop>
- <label_id>desktop_e17</label_id>
+ <name>enlightenment</name>
+ <desktop>enlightenment</desktop>
+ <label_id>desktop_enlightenment</label_id>
<logon>lightdm</logon>
<cursor>DMZ</cursor>
<packages>lightdm branding-openSUSE</packages>
<order config:type="integer">7</order>
- <patterns>e17 x11 base</patterns>
- <icon>pattern-e17</icon>
+ <patterns>enlightenment x11 base</patterns>
+ <icon>pattern-enlightenment</icon>
</one_supported_desktop>
<one_supported_desktop>
<name>textmode</name>
<desktop>twm</desktop>
<label_id>desktop_textmode</label_id>
- <logon>xdm</logon>
+ <logon></logon>
<cursor>DMZ</cursor>
<packages>branding-openSUSE</packages>
<order config:type="integer">8</order>
<patterns>minimal_base minimal_base-conflicts</patterns>
- <icon>yast-sshd</icon>
+ <icon>yast-ssh-server</icon>
</one_supported_desktop>
</supported_desktops>
@@ -385,10 +397,11 @@
<!-- Desktop dialog: desktop names -->
<desktop_gnome><label>GNOME Desktop</label></desktop_gnome>
<desktop_kde><label>KDE Desktop</label></desktop_kde>
+ <desktop_server><label>Server (Text Mode)</label></desktop_server>
<desktop_xfce><label>XFCE Desktop</label></desktop_xfce>
<desktop_lxde><label>LXDE Desktop</label></desktop_lxde>
<desktop_min_x><label>Minimal X Window</label></desktop_min_x>
- <desktop_e17><label>Enlightenment Desktop</label></desktop_e17>
+ <desktop_enlightenment><label>Enlightenment
Desktop</label></desktop_enlightenment>
<desktop_textmode><label>Minimal Server Selection (Text
Mode)</label></desktop_textmode>
</texts>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-13.2.22/package/skelcd-control-openSUSE.changes
new/skelcd-control-openSUSE-13.2.24/package/skelcd-control-openSUSE.changes
--- old/skelcd-control-openSUSE-13.2.22/package/skelcd-control-openSUSE.changes
2015-05-07 09:57:08.000000000 +0200
+++ new/skelcd-control-openSUSE-13.2.24/package/skelcd-control-openSUSE.changes
2015-10-16 10:12:09.000000000 +0200
@@ -1,4 +1,26 @@
-------------------------------------------------------------------
+Fri Oct 16 07:43:15 UTC 2015 - dmuel...@suse.com
+
+- add emergency update channel for the tumbleweed ports
+- 13.2.24
+
+-------------------------------------------------------------------
+Tue Sep 29 09:27:24 UTC 2015 - jreidin...@suse.com
+
+- The e17 pattern was renamed to enlightenment a while back, adapt
+ the Display manager dialog to this change
+ by Simon Lees <si...@simotek.net>
+- 13.2.23
+
+-------------------------------------------------------------------
+Wed Sep 23 10:29:37 UTC 2015 - sndir...@suse.com
+
+- use empty string as DISPLAYMANAGER for minimal+X11 and textmode
+ pattern, which on the system already results in chosing xdm as
+ default DM; this enables us to set displaymanager in %post of
+ the appropriated DM package (FATE#319432)
+
+-------------------------------------------------------------------
Thu Apr 30 14:43:23 UTC 2015 - m...@suse.com
- Use Plasma 5 as default KDE environment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-13.2.22/package/skelcd-control-openSUSE.spec
new/skelcd-control-openSUSE-13.2.24/package/skelcd-control-openSUSE.spec
--- old/skelcd-control-openSUSE-13.2.22/package/skelcd-control-openSUSE.spec
2015-05-07 09:57:08.000000000 +0200
+++ new/skelcd-control-openSUSE-13.2.24/package/skelcd-control-openSUSE.spec
2015-10-16 10:12:09.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
######################################################################
#
# IMPORTANT: Please do not change the control file or this spec file
@@ -25,22 +26,30 @@
# for more details.
#
######################################################################
-
Name: skelcd-control-openSUSE
+Version: 13.2.24
+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
BuildRequires: libxslt-tools
# RNG schema
BuildRequires: yast2-installation-control >= 3.1.7
-
######################################################################
#
# Here is the list of Yast packages which are needed in the
# installation system (inst-sys) for the Yast installer
#
-
# Generic Yast packages needed for the installer
+#
+######################################################################
Requires: autoyast2
Requires: yast2-add-on
Requires: yast2-fcoe-client
@@ -53,77 +62,66 @@
Requires: yast2-nfs-client
Requires: yast2-ntp-client
Requires: yast2-proxy
+# this is the default theme
+Requires: yast2-qt-branding-openSUSE
Requires: yast2-services-manager
Requires: yast2-slp
+Requires: yast2-theme-openSUSE-Oxygen
Requires: yast2-trans-stats
Requires: yast2-tune
Requires: yast2-update
Requires: yast2-users
Requires: yast2-x11
-# this is the default theme
-Requires: yast2-theme-openSUSE-Oxygen
-Requires: yast2-qt-branding-openSUSE
-
+Conflicts: product_control
+Provides: product_control
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Architecture specific packages
-#
-
%ifarch %ix86 x86_64
-Requires: yast2-vm
+Requires: yast2-vm
%endif
-#
-######################################################################
-
-Url: https://github.com/yast/skelcd-control-openSUSE
-AutoReqProv: off
-Version: 13.2.22
-Release: 0
-Summary: The openSUSE Installation Control file
-License: MIT
-Group: Metapackages
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-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
-Provides: product_control
-Conflicts: product_control
-
%description
This package contains the control file used for openSUSE installation.
%prep
-%setup -n skelcd-control-openSUSE-%{version}
+%setup -q -n skelcd-control-openSUSE-%{version}
%build
-make -C control
+make %{?_smp_mflags} -C control
%check
-make -C control check
+make %{?_smp_mflags} -C control check
%install
#
-# Add control file
+# Add control file
#
-mkdir -p $RPM_BUILD_ROOT/CD1
+mkdir -p %{buildroot}/CD1
%if "%{name}" == "skelcd-control-openSUSE-promo"
-CONTROL_FILE=control.openSUSE-promo.xml
+ CONTROL_FILE=control.openSUSE-promo.xml
%else
-CONTROL_FILE=control.openSUSE.xml
+ CONTROL_FILE=control.openSUSE.xml
%endif
-install -m 644 control/$CONTROL_FILE $RPM_BUILD_ROOT/CD1/control.xml
+install -m 644 control/$CONTROL_FILE %{buildroot}/CD1/control.xml
-%ifarch ppc ppc64 ppc64le
-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/tumbleweed/,http://download.opensuse.org/ports/ppc/tumbleweed/,";
$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
-#we parse out non existing non-oss repo for Power
-xsltproc -o $RPM_BUILD_ROOT/CD1/control_ppc.xml control/nonoss.xsl
$RPM_BUILD_ROOT/CD1/control.xml
-mv $RPM_BUILD_ROOT/CD1/control{_ppc,}.xml
-xmllint --noout --relaxng /usr/share/YaST2/control/control.rng
$RPM_BUILD_ROOT/CD1/control.xml
+%ifarch aarch64 %arm ppc ppc64 ppc64le
+ %ifarch ppc ppc64 ppc64le
+ ports_arch="ppc"
+ %else
+ ports_arch="%{_arch}"
+ %endif
+ sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ #we parse out non existing non-oss repo for ports
+ xsltproc -o %{buildroot}/CD1/control_ports.xml control/nonoss.xsl
%{buildroot}/CD1/control.xml
+ mv %{buildroot}/CD1/control{_ports,}.xml
+ xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}/CD1/control.xml
%endif
%files
