The package rpms/redhat-lsb.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/redhat-lsb.git/commit/?id=f67bc37....
Change:
-%ifarch ia64 ppc64 s390x x86_64
Thanks.
Full change:
============
commit 4d8597730ff396bb49db87a2e7a02639b770b368
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Oct 6 16:44:18 2023 +0100
Update README.md with actual status
diff --git a/.gitignore b/.gitignore
index 73501a5..7ceefad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
redhat-lsb-4.0-1.tar.bz2
/redhat-lsb-4.1-1.tar.bz2
/redhat-lsb-20231006git92f8ab57.tar.gz
+/redhat-lsb-20231006gita9c49411.tar.gz
+/redhat-lsb-20231006git8d00acdc.tar.gz
diff --git a/redhat-lsb-snapshot.sh b/redhat-lsb-snapshot.sh
index d2e09a7..f2e8df7 100755
--- a/redhat-lsb-snapshot.sh
+++ b/redhat-lsb-snapshot.sh
@@ -21,3 +21,5 @@ sed -i "s|^%global gitdate .*|%global gitdate ${date}|"
redhat-lsb.spec
sed -i "s|^%global gitversion .*|%global gitversion ${tag}|" redhat-lsb.spec
echo fedpkg new-sources $(spectool -l --sources redhat-lsb.spec | sed 's/.*:
//;s/.*\///')
+echo \MSG="\"Update README.md with actual status\""
+echo rpmdev-bumpspec -c \"\$MSG\" $(basename $(pwd)).spec
diff --git a/redhat-lsb.spec b/redhat-lsb.spec
index fec6993..cf15cd1 100644
--- a/redhat-lsb.spec
+++ b/redhat-lsb.spec
@@ -1,6 +1,6 @@
-# globals for redhat-lsb-20231006git92f8ab57.tar.gz
+# globals for redhat-lsb-20231006git8d00acdc.tar.gz
%global gitdate 20231006
-%global gitversion 92f8ab57
+%global gitversion 8d00acdc
%global snapshot %{gitdate}git%{gitversion}
%global gver .%{gitdate}git%{gitversion}
@@ -77,7 +77,7 @@
Summary: Implementation of Linux Standard Base specification
Name: redhat-lsb
Version: 5.0
-Release: 0.1%{gver}%{?dist}
+Release: 0.2%{gver}%{?dist}
URL:
https://wiki.linuxfoundation.org/lsb/start
#
https://github.com/LinuxStandardBase/lsb-samples/
Source0: redhat-lsb-%{snapshot}.tar.gz
@@ -539,6 +539,9 @@ ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd
%changelog
+* Fri Oct 06 2023 Sérgio Basto <sergio(a)serjux.com> - 5.0-0.2.20231006gita9c49411
+- Update README.md with actual status
+
* Fri Oct 06 2023 Sérgio Basto <sergio(a)serjux.com> - 5.0-0.1.20231006git92f8ab57
- redhat-lsb 5.0 with new source location
diff --git a/sources b/sources
index 1b82379..1202e62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (redhat-lsb-20231006git92f8ab57.tar.gz) =
c47767cbcf72ec030faf1327b227c529cb059904a0875525623b0e71860f3b4053a4a020d5c2427e0adec2786b444e6c6b4cec25ced70b558b11d658c6c278a5
+SHA512 (redhat-lsb-20231006git8d00acdc.tar.gz) =
c6c357c48fbc7805fd40a69c08f0a64589d57a9c25e9afff6b5a5e7d215ded6a6f16feefd3d5cd79d6ef39e0c2d1a2699860e3feeab37e5349e9cb1fe407b5a6
commit f67bc37a0120db0ba2a922e7101be9c7152bc04a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 10 01:38:43 2023 +0100
redhat-lsb 5.0 with new source location
diff --git a/.gitignore b/.gitignore
index 997938c..73501a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
redhat-lsb-4.0-1.tar.bz2
/redhat-lsb-4.1-1.tar.bz2
+/redhat-lsb-20231006git92f8ab57.tar.gz
diff --git a/lsb-release-2.0-disable-etc-lsb-release.patch
b/lsb-release-2.0-disable-etc-lsb-release.patch
deleted file mode 100644
index 49db48d..0000000
--- a/lsb-release-2.0-disable-etc-lsb-release.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- lsb-release-2.0.orig/lsb_release 2004-07-01 03:30:34.000000000 +1000
-+++ lsb-release-2.0/lsb_release 2005-08-03 23:31:58.000000000 +1000
-@@ -188,15 +188,6 @@
-
- # Get/Init LSB infos (maybe Distrib infos too)
- GetLSBInfo() {
-- if [ -f "$INFO_ROOT/$INFO_LSB_FILE" ]
-- then
-- # should init at least LSB_VERSION
-- . "$INFO_ROOT/$INFO_LSB_FILE"
-- fi
-- if [ -z "$LSB_VERSION" ]
-- then
-- LSB_VERSION=$MSG_NA
-- else
- # if we found LSB_VERSION, continue to look in directory
- if [ -d "$INFO_ROOT/$INFO_LSB_DIR" ]
- then
-@@ -205,7 +196,6 @@
- LSB_VERSION=$LSB_VERSION:`basename $tag`
- done
- fi
-- fi
- }
-
- # Get the whole distrib information string (from ARG $1 file)
diff --git a/lsb-release-3.1-update-init-functions.patch
b/lsb-release-3.1-update-init-functions.patch
deleted file mode 100644
index 1211cb7..0000000
--- a/lsb-release-3.1-update-init-functions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urN redhat-lsb-3.1/init-functions redhat-lsb-3.1.mod/init-functions
---- redhat-lsb-3.1/init-functions 2006-12-06 12:24:29.000000000 +1000
-+++ redhat-lsb-3.1.mod/init-functions 2007-06-26 15:41:35.000000000 +1000
-@@ -1,6 +1,10 @@
- #!/bin/sh
-
- # LSB initscript functions, as defined in the LSB Spec 1.1.0
-+#
-+# Lawrence Lim <llim(a)redhat.com> - Tue, 26 June 2007
-+# Updated to the latest LSB 3.1 spec
-+#
http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-gen...
-
- start_daemon () {
- /etc/redhat-lsb/lsb_start_daemon "$@"
-@@ -10,7 +14,7 @@
- /etc/redhat-lsb/lsb_killproc "$@"
- }
-
--pidofprof () {
-+pidofproc () {
- /etc/redhat-lsb/lsb_pidofproc "$@"
- }
-
-@@ -22,7 +26,7 @@
- /etc/redhat-lsb/lsb_log_message failure "$@"
- }
-
--log_warning_message () {
-+log_warning_msg () {
- /etc/redhat-lsb/lsb_log_message warning "$@"
- }
-
diff --git a/redhat-lsb-lsb_start_daemon-fix.patch
b/redhat-lsb-lsb_start_daemon-fix.patch
deleted file mode 100644
index 69f5f28..0000000
--- a/redhat-lsb-lsb_start_daemon-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
---- redhat-lsb-3.1/lsb_start_daemon.orig 2009-05-15 11:20:17.000000000 -0400
-+++ redhat-lsb-3.1/lsb_start_daemon 2009-05-15 11:33:03.000000000 -0400
-@@ -4,6 +4,9 @@
-
- nice=
- force=
-+pidfile=
-+user=
-+check=
- RETVAL=
- while [ "$1" != "${1##[-+]}" ]; do
- case $1 in
-@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
- nice=$2
- shift 2
- ;;
-+ -p)
-+ pidfile="--pidfile $2"
-+ shift 2
-+ ;;
-+ -u)
-+ user="--user $2"
-+ shift 2
-+ ;;
-+ -c)
-+ check="--check $2"
-+ shift 2
-+ ;;
-+ *)
-+ echo "Unknown Option $1"
-+ echo "Options are:"
-+ echo "-f"
-+ echo "-p {pidfile}"
-+ echo "-n [+/-nicelevel]"
-+ echo "-u {user}"
-+ echo "-c {base}"
-+ exit 1;;
- esac
- done
--LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
-+LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
- exit $?
diff --git a/redhat-lsb-snapshot.sh b/redhat-lsb-snapshot.sh
new file mode 100755
index 0000000..d2e09a7
--- /dev/null
+++ b/redhat-lsb-snapshot.sh
@@ -0,0 +1,23 @@
+package=redhat-lsb
+branch=main
+commit=HEAD
+
+if [ ! -d redhat-lsb.pagure ]; then
+ git clone ssh://git@pagure.io/redhat-lsb.git redhat-lsb.pagure
+fi
+
+pushd redhat-lsb.pagure
+tag=$(git rev-list HEAD -n 1 | cut -c 1-8)
+date=$(git log -1 --format=%cd --date=short | tr -d \-)
+git archive --prefix="${package}-${date}git${tag}/" --format=tar ${branch} |
gzip > ../${package}-${date}git${tag}.tar.gz
+popd
+
+echo \# globals for ${package}-${date}git${tag}.tar.gz
+echo %global gitdate ${date}
+echo %global gitversion ${tag}
+
+sed -i "s|^# globals for .*|# globals for ${package}-${date}git${tag}.tar.gz|"
redhat-lsb.spec
+sed -i "s|^%global gitdate .*|%global gitdate ${date}|" redhat-lsb.spec
+sed -i "s|^%global gitversion .*|%global gitversion ${tag}|" redhat-lsb.spec
+
+echo fedpkg new-sources $(spectool -l --sources redhat-lsb.spec | sed 's/.*:
//;s/.*\///')
diff --git a/redhat-lsb.spec b/redhat-lsb.spec
index c036311..fec6993 100644
--- a/redhat-lsb.spec
+++ b/redhat-lsb.spec
@@ -1,3 +1,10 @@
+# globals for redhat-lsb-20231006git92f8ab57.tar.gz
+%global gitdate 20231006
+%global gitversion 92f8ab57
+
+%global snapshot %{gitdate}git%{gitversion}
+%global gver .%{gitdate}git%{gitversion}
+
# Define this to link to which library version eg. /lib64/ld-lsb-x86-64.so.3
%global lsbsover 3
@@ -56,15 +63,8 @@
%global lsbldso ld-lsb-aarch64.so
%endif
-%ifarch ia64 ppc64 s390x x86_64
-%global qual ()(64bit)
-%else
-%global qual %{nil}
-%endif
-
%global upstreamlsbrelver 2.0
-%global lsbrelver 4.1
-%global srcrelease 1
+%global lsbrelver 5.0
# for >= f28, __brp_ldconfig is added in __os_install_post, it removes the symlink
%%{lsbldso}
# and thus leading to the FTBS.
@@ -76,12 +76,11 @@
Summary: Implementation of Linux Standard Base specification
Name: redhat-lsb
-Version: 4.1
-Release: 62%{?dist}
-URL:
http://www.linuxfoundation.org/collaborate/workgroups/lsb
-Source0:
https://fedorahosted.org/releases/r/e/redhat-lsb/%{name}-%{version}-%{src...
-Patch0: lsb-release-3.1-update-init-functions.patch
-Patch1: redhat-lsb-lsb_start_daemon-fix.patch
+Version: 5.0
+Release: 0.1%{gver}%{?dist}
+URL:
https://wiki.linuxfoundation.org/lsb/start
+#
https://github.com/LinuxStandardBase/lsb-samples/
+Source0: redhat-lsb-%{snapshot}.tar.gz
License: GPLv2
BuildRequires: make
BuildRequires: perl-generators
@@ -126,7 +125,7 @@ Requires: redhat-lsb-cxx%{?_isa} = %{version}-%{release}
Requires: redhat-lsb-desktop%{?_isa} = %{version}-%{release}
Requires: redhat-lsb-languages = %{version}-%{release}
Requires: redhat-lsb-printing = %{version}-%{release}
-#Requires: redhat-lsb-trialuse = %%{version}-%%{release}
+Obsoletes: redhat-lsb-trialuse <= 5
Provides: lsb = %{version}-%{release}
Provides: lsb-%{archname} = %{version}-%{release}
@@ -448,85 +447,101 @@ passing LSB (Linux Standard Base) certification testsuite, but not
directly requ
to be on LSB conforming system.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n redhat-lsb-%{snapshot}
%build
-cd lsb-release-%{upstreamlsbrelver}
+cd lsb_release/src
%make_build
%install
-# LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_libdir}
$RPM_BUILD_ROOT%{_mandir} \
- $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \
- $RPM_BUILD_ROOT%{_sbindir}
-
+pushd redhat-lsb
+%make_install
# manually add Locale::Constants. This module is just an alias of
Locale::Codes::Constants
-mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/Locale
-cp -p Constants.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Locale
-cp -p Constants.pod $RPM_BUILD_ROOT%{perl_vendorlib}/Locale
+mkdir -p %{buildroot}%{perl_vendorlib}/Locale
+cp -p Constants.pm %{buildroot}%{perl_vendorlib}/Locale
+cp -p Constants.pod %{buildroot}%{perl_vendorlib}/Locale
+popd
-%make_install
-cd lsb-release-%{upstreamlsbrelver}
-make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
-cd ..
+pushd lsb_release/src
+make mandir=%{buildroot}%{_mandir} prefix=%{buildroot}%{_prefix} install
+popd
#prepare installation of doc
-cp -p lsb-release-2.0/COPYING .
-cp -p lsb-release-2.0/README README.lsb_release
+cp -p lsb_release/src/COPYING .
+cp -p lsb_release/src/README README.lsb_release
+
+# modules
+mkdir -p %{buildroot}%{_sysconfdir}/lsb-release.d/
+modules="core cxx desktop languages printing"
+
+core="core security"
+cxx="cpp"
+desktop="desktop-misc graphics graphics-ext multimedia toolkit-gtk toolkit-qt
toolkit-qt3"
+desktop="${desktop} xml"
+languages="perl python"
+printing="printing"
+trialuse="security multimedia"
+
+for mod in ${modules};do
+ touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-%{archname}
+ touch $RPM_BUILD_ROOT%{_sysconfdir}/lsb-release.d/${mod}-%{lsbrelver}-noarch
+done
+mkdir -p %{buildroot}%{_libdir}
for LSBVER in %{lsbsover}; do
- ln -snf %{ldso} $RPM_BUILD_ROOT/%{_libdir}/%{lsbldso}.$LSBVER
+ ln -snf %{ldso} %{buildroot}%{_libdir}/%{lsbldso}.$LSBVER
done
-mkdir -p $RPM_BUILD_ROOT/bin
-
# LSB uses /usr/lib rather than /usr/lib64 even for 64bit OS
-# According to the lsb-core documentation provided by
+# According to the lsb-core documentation provided by
#
http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-...
# it's OK to put non binary in /usr/lib.
-ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/install_initd
-ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
-#ln -snf mail $RPM_BUILD_ROOT/bin/mailx
-
-#mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver
-#ln -snf /usr/%{_lib}/xserver/SecurityPolicy
$RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver/SecurityPolicy
-#ln -snf /usr/share/X11/fonts $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts
-#ln -snf /usr/share/X11/rgb.txt $RPM_BUILD_ROOT/usr/X11R6/lib/X11/rgb.txt
+ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/install_initd
+ln -snf ../../../sbin/chkconfig %{buildroot}/usr/lib/lsb/remove_initd
+#ln -snf mail %{buildroot}/bin/mailx
-cp -p redhat_lsb_init $RPM_BUILD_ROOT/bin/redhat_lsb_init
+#mkdir -p %{buildroot}/usr/X11R6/lib/X11/xserver
+#ln -snf /usr/%{_lib}/xserver/SecurityPolicy
%{buildroot}/usr/X11R6/lib/X11/xserver/SecurityPolicy
+#ln -snf /usr/share/X11/fonts %{buildroot}/usr/X11R6/lib/X11/fonts
+#ln -snf /usr/share/X11/rgb.txt %{buildroot}/usr/X11R6/lib/X11/rgb.txt
%files
%files core
-%doc README README.lsb_release
+%doc README.md README.lsb_release
%license COPYING
%{_sysconfdir}/redhat-lsb
+%dir %{_sysconfdir}/lsb-release.d
%{_mandir}/*/*
%{_bindir}/*
-/bin/redhat_lsb_init
/usr/lib/lsb
%{_libdir}/*so*
-/lib/lsb*
+%{_sysconfdir}/lsb-release.d/core*
%files cxx
+%{_sysconfdir}/lsb-release.d/cxx*
%files desktop
+%{_sysconfdir}/lsb-release.d/desktop*
%files languages
+%{_sysconfdir}/lsb-release.d/languages*
%{perl_vendorlib}/Locale/Constants.pm
%{perl_vendorlib}/Locale/Constants.pod
%files printing
+%{_sysconfdir}/lsb-release.d/printing*
%files supplemental
#no files, just dependencies
%changelog
+* Fri Oct 06 2023 Sérgio Basto <sergio(a)serjux.com> - 5.0-0.1.20231006git92f8ab57
+- redhat-lsb 5.0 with new source location
+
* Fri Jul 21 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.1-62
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index c24d88d..1b82379 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c1e474cb81c0ee1941c3129e0e50ea1 redhat-lsb-4.1-1.tar.bz2
+SHA512 (redhat-lsb-20231006git92f8ab57.tar.gz) =
c47767cbcf72ec030faf1327b227c529cb059904a0875525623b0e71860f3b4053a4a020d5c2427e0adec2786b444e6c6b4cec25ced70b558b11d658c6c278a5
commit 96822c937990fb95ca8343d1102bc6146e2fabaf
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Apr 23 07:44:02 2023 +0100
Centos-8 package merged and ncurses-compat-libs is back
drop qt3 (#1298936)
diff --git a/redhat-lsb.spec b/redhat-lsb.spec
index ff29e2f..c036311 100644
--- a/redhat-lsb.spec
+++ b/redhat-lsb.spec
@@ -149,12 +149,8 @@ Requires: glibc-common
Requires: libgcc%{?_isa}
#LSB requires libcrypt.so.1
Requires: libxcrypt-compat%{?_isa}
-%if 0%{?fedora} > 36
-Requires: ncurses-libs%{?_isa}
-%else
#LSB requires libncurses.so.5 for some reason
Requires: ncurses-compat-libs%{?_isa}
-%endif
Requires: pam%{?_isa}
Requires: zlib%{?_isa}
@@ -355,11 +351,11 @@ Requires: gdk-pixbuf2%{?_isa}
Requires: glib2%{?_isa}
Requires: gtk2%{?_isa}
Requires: pango%{?_isa}
-# toolkit-qt
+%if 0%{?fedora} || 0%{?epel}
+# toolkit-qt is not in rhel
Requires: qt%{?_isa}
Requires: qt-x11%{?_isa}
-# toolkit-qt3
-Requires: qt3%{?_isa}
+%endif
# xml
Requires: libxml2%{?_isa}
Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}
@@ -408,8 +404,8 @@ Requires: perl(File::CheckTree)
Requires: perl(Sys::Syslog)
Requires: perl(Getopt::Long)
-# python
-Requires: /usr/bin/python
+# python3
+Requires: /usr/bin/python3
# java
Requires: redhat-lsb-core%{?_isa} = %{version}-%{release}