$ git diff --patch-with-stat --summary 608c5b65a864b126acca765c2ea1d3165425e6ce..b87c2623a0c5d16aea12902f6e9d32bacbfb1485
.abf.yml | 2 +-
distro-release.spec | 33 +++++++++++++++++----------------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 309ee66..831b1f3 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- distro-release-23.01.tar.gz: 0302f7fbd2d5e8a03e7f7f4852c36bd302466b74
+ master.tar.gz: 63e9d9900505632d8ceca09e9a565146eddf85b1
diff --git a/distro-release.spec b/distro-release.spec
index 3c60502..725792d 100644
--- a/distro-release.spec
+++ b/distro-release.spec
@@ -7,31 +7,31 @@
%define new_vendor OpenMandriva
%define new_product OpenMandriva Lx
# (tpg) use codename from here https://wiki.openmandriva.org/en/policies/codename
-%define new_codename ROME
+%define new_codename Nickel
%define vendor_tag %(echo %{new_vendor} |tr A-Z a-z)
%define distribution_tag %(echo %{new_distribution} |tr A-Z a-z |sed -e 's,[ /!?],_,g')
%define product_tag %(echo %{new_product} |tr A-Z a-z |sed -e 's,[ /!?],_,g')
%define shorttag omv
%define new_disturl http://openmandriva.org/
-%define new_bugurl https://github.com/OpenMandrivaAssociation/distribution/issues
+%define new_bugurl https://github.com/OpenMandrivaAssociation/distribution/issues/
-%define am_i_cooker 0
-%define am_i_rolling 1
-%if %am_i_cooker
+%define am_i_cooker 1
+%undefine am_i_rolling
+%if 0%?am_i_cooker
%define distrib Cooker
%else
-%if %am_i_rolling
+%if 0%?am_i_rolling
%define distrib Rolling
%else
-%define distrib Official
+%define distrib Rock
%endif
%endif
%define _distribution %(echo %{new_distribution} | tr A-Z a-z |sed -e 's#[ /()!?]#_#g')
%define product_type Basic
-%if %am_i_cooker
+%if 0%?am_i_cooker
%define product_branch Devel
%else
-%define product_branch Official
+%define product_branch Rock
%endif
%define product_release 1
%define product_arch %{_target_cpu}
@@ -39,7 +39,7 @@
# The Distribution release, what is written on box
%define distro_release %{version}
-# The distro branch: Cooker, Community or Official
+# The distro branch: Cooker, Rolling or Rock
%define distro_branch %{distrib}
# The distro arch, notice: using %_target_cpu is bad
@@ -51,7 +51,7 @@
%define major %(printf %u %(echo %{version}|cut -d. -f1))
%define minor %([ -z "%(echo %{version}|cut -d. -f2)" ] && echo 0 || printf %u %(echo %{version}|cut -d. -f2))
%define subminor %([ -z "%(echo %{version}|cut -d. -f3)" ] && echo 0 || printf %u %(echo %{version}|cut -d. -f3))
-%if %am_i_cooker || %am_i_rolling
+%if 0%?am_i_cooker || 0%?am_i_rolling
# 22.12 looks better as omv2212 than omv22012...
%define distro_tag %(echo $((%{major}*100+%{minor})))
%define version_tag %(echo $((%{major}*1000000+%{minor}*1000+%{subminor})))
@@ -71,7 +71,7 @@
Summary: %{new_distribution} release file
Name: distro-release
-Version: 23.01
+Version: 23.90
# (tpg) something needs to be done to make comparision 3.0 > 2015.0 came true
# 3001 = 3.1
# 3001 = 3.2 etc.
@@ -79,7 +79,7 @@ DistTag: %{shorttag}%{distro_tag}
Release: 2
License: GPLv2+
URL: https://github.com/OpenMandrivaSoftware/distro-release
-Source0: https://github.com/OpenMandrivaSoftware/distro-release/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: https://github.com/OpenMandrivaSoftware/distro-release/archive/%{?am_i_cooker:refs/heads/master}%{!?am_i_cooker:%{version}/%{name}-%{version}}.tar.gz
Group: System/Configuration/Other
%description
@@ -427,7 +427,7 @@ This package contains useful icons, menu structure and others goodies for the
%{distribution} desktop.
%prep
-%autosetup -p1
+%autosetup -p1 %{?am_i_cooker:-n distro-release-master}
# check that CREDITS file is in UTF-8, fail otherwise
if iconv -f utf-8 -t utf-8 < doc/CREDITS > /dev/null
then
@@ -561,6 +561,7 @@ install -m 0755 desktops/bin/www-browser %{buildroot}/%{_bindir}/
install -m 0755 desktops/bin/xvt %{buildroot}/%{_bindir}/
## Install faces
+
install -d -m 0755 %{buildroot}/%{_datadir}/mdk/faces/
install -d -m 0755 %{buildroot}/%{_datadir}/faces/
cp -a desktops/faces/*.png %{buildroot}/%{_datadir}/mdk/faces/
@@ -887,10 +888,10 @@ done
sed -i '$ d' %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
## And enable the one we're installing from
-%if %am_i_cooker
+%if 0%?am_i_cooker
sed -e '0,/enabled=0/s//enabled=1/' -i %{buildroot}%{_sysconfdir}/yum.repos.d/openmandriva-cooker-${ARCH}.repo
%else
-%if %am_i_rolling
+%if 0%?am_i_rolling
sed -e '0,/enabled=0/s//enabled=1/' -i %{buildroot}%{_sysconfdir}/yum.repos.d/openmandriva-rolling-${ARCH}.repo
%else
# Second occurence in $RELEASE and Rock is updates/