The package rpms/libast.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/libast.git/commit/?id=7c4e6ef62a9....
Change:
-%ifarch %{multilib_arches}
Thanks.
Full change:
============
commit f00fb126eb7e960c573d06ac7d70df08c7cdbe20
Author: Terje Rosten <terje.rosten(a)ntnu.no>
Date: Wed Oct 26 20:19:25 2022 +0200
Switch to POSIX regex
diff --git a/libast.spec b/libast.spec
index 40c17f8..fbd0815 100644
--- a/libast.spec
+++ b/libast.spec
@@ -3,7 +3,7 @@
Summary: Library of Assorted Spiffy Things
Name: libast
Version: 0.7.1
-Release: 0.33.%{cvs}cvs%{?dist}
+Release: 0.34.%{cvs}cvs%{?dist}
License: BSD
URL:
http://www.eterm.org/
# Sources are pulled from cvs:
@@ -19,7 +19,6 @@ BuildRequires: imlib2-devel
BuildRequires: libXt-devel
BuildRequires: libtool
BuildRequires: make
-BuildRequires: pcre-devel
%description
LibAST is the Library of Assorted Spiffy Things. It contains various
@@ -45,7 +44,7 @@ you will need to install %{name}-devel.
%build
./autogen.sh
autoupdate
-%configure
+%configure --with-regexp=posix
%make_build
%install
@@ -78,6 +77,9 @@ touch -r ChangeLog %{buildroot}%{_bindir}/%{name}-config
%exclude %{_libdir}/*.a
%changelog
+* Wed Oct 26 2022 Terje Rosten <terje.rosten(a)ntnu.no>- 0.7.1-0.34.20080502cvs
+- Switch to POSIX regex
+
* Wed Sep 14 2022 Terje Rosten <terje.rosten(a)ntnu.no>- 0.7.1-0.33.20080502cvs
- Fix typos
commit 7d7d9423164151ad0b35c094ae21868914785933
Author: Terje Rosten <terje.rosten(a)ntnu.no>
Date: Wed Sep 14 16:59:46 2022 +0200
Fix typos
diff --git a/libast-wrapper.h b/libast-wrapper.h
index b0f8b15..c40f666 100644
--- a/libast-wrapper.h
+++ b/libast-wrapper.h
@@ -1,27 +1,36 @@
/* This file is here to prevent a file conflict on multiarch systems. A
* conflict will occur because <HEADER>.h has arch-specific definitions.
*
- * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD.
+ */
#if defined(__aarch64__)
#include "<HEADER>-aarch64.h"
-#if defined(__i386__)
+
+#elif defined(__i386__)
#include "<HEADER>-i386.h"
+
#elif defined(__ia64__)
#include "<HEADER>-ia64.h"
+
+#elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)
+#include "<HEADER>-ppc64le.h"
+
#elif defined(__powerpc64__)
#include "<HEADER>-ppc64.h"
+
#elif defined(__powerpc__)
#include "<HEADER>-ppc.h"
-#elif defined(__ppc64le__)
-#include "<HEADER>-ppc64le.h"
+
#elif defined(__s390x__)
#include "<HEADER>-s390x.h"
+
#elif defined(__s390__)
#include "<HEADER>-s390.h"
+
#elif defined(__x86_64__)
#include "<HEADER>-x86_64.h"
+
#else
#error "This libast-devel package does not work your architecture?"
#endif
-
diff --git a/libast.spec b/libast.spec
index f2e23a9..40c17f8 100644
--- a/libast.spec
+++ b/libast.spec
@@ -3,7 +3,7 @@
Summary: Library of Assorted Spiffy Things
Name: libast
Version: 0.7.1
-Release: 0.32.%{cvs}cvs%{?dist}
+Release: 0.33.%{cvs}cvs%{?dist}
License: BSD
URL:
http://www.eterm.org/
# Sources are pulled from cvs:
@@ -78,7 +78,10 @@ touch -r ChangeLog %{buildroot}%{_bindir}/%{name}-config
%exclude %{_libdir}/*.a
%changelog
-* Tue Sep 13 2022 Terje Røsten <terje.rosten(a)ntnu.no> -0.7.1-0.32.20080502cvs
+* Wed Sep 14 2022 Terje Rosten <terje.rosten(a)ntnu.no>- 0.7.1-0.33.20080502cvs
+- Fix typos
+
+* Tue Sep 13 2022 Terje Rosten <terje.rosten(a)ntnu.no>- 0.7.1-0.32.20080502cvs
- Fix for rhbz#2113215
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.7.1-0.31.20080502cvs
commit 7c4e6ef62a998565d7ecb3da93d3cecbbf5c8301
Author: Terje Rosten <terje.rosten(a)ntnu.no>
Date: Tue Sep 13 21:19:05 2022 +0200
Fix for rhbz#2113215
diff --git a/libast-m4-include.patch b/libast-m4-include.patch
new file mode 100644
index 0000000..f92d715
--- /dev/null
+++ b/libast-m4-include.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+index f15ef06..0f2adfc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -22,6 +22,7 @@ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(libast, 0.7.1)
+ AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version])
+ AM_CONFIG_HEADER(config.h include/libast/sysdefs.h)
++m4_include([libast.m4])
+
+ LIBTOOLIZE="${SAVE_LIBTOOLIZE:-libtoolize}"
+ ACLOCAL="${SAVE_ACLOCAL:-aclocal}"
diff --git a/libast-wrapper.h b/libast-wrapper.h
index f17625d..b0f8b15 100644
--- a/libast-wrapper.h
+++ b/libast-wrapper.h
@@ -3,6 +3,8 @@
*
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+#if defined(__aarch64__)
+#include "<HEADER>-aarch64.h"
#if defined(__i386__)
#include "<HEADER>-i386.h"
#elif defined(__ia64__)
@@ -11,6 +13,8 @@
#include "<HEADER>-ppc64.h"
#elif defined(__powerpc__)
#include "<HEADER>-ppc.h"
+#elif defined(__ppc64le__)
+#include "<HEADER>-ppc64le.h"
#elif defined(__s390x__)
#include "<HEADER>-s390x.h"
#elif defined(__s390__)
diff --git a/libast.spec b/libast.spec
index 65ff8ab..f2e23a9 100644
--- a/libast.spec
+++ b/libast.spec
@@ -1,13 +1,9 @@
-# Arches on which the multilib {sysdefs,types}.h hack is needed:
-# (Update libast-wrapper.h when adding archs)
-
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
-%define cvs 20080502
+%global cvs 20080502
Summary: Library of Assorted Spiffy Things
Name: libast
Version: 0.7.1
-Release: 0.31.%{cvs}cvs%{?dist}
+Release: 0.32.%{cvs}cvs%{?dist}
License: BSD
URL:
http://www.eterm.org/
# Sources are pulled from cvs:
@@ -16,9 +12,14 @@ URL:
http://www.eterm.org/
# $ tar czvf libast-20080502.tar.gz libast-20080502
Source: libast-%{cvs}.tar.gz
Source1: libast-wrapper.h
-BuildRequires: imlib2-devel pcre-devel libXt-devel
-BuildRequires: automake autoconf libtool
+Patch0: libast-m4-include.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: imlib2-devel
+BuildRequires: libXt-devel
+BuildRequires: libtool
BuildRequires: make
+BuildRequires: pcre-devel
%description
LibAST is the Library of Assorted Spiffy Things. It contains various
@@ -29,7 +30,7 @@ well as some debugging aids and other similar tools.
It's not documented yet, mostly because it's not finished. Hence the
version number that begins with 0.
-%package devel
+%package devel
Summary: Header files, libraries and development documentation for %{name}
Requires: %{name} = %{version}-%{release}
@@ -39,34 +40,32 @@ documentation for %{name}. If you like to develop programs using
%{name},
you will need to install %{name}-devel.
%prep
-%setup -q -n %{name}-%{cvs}
+%autosetup -n %{name}-%{cvs}
%build
./autogen.sh
+autoupdate
%configure
-%{__make} %{?_smp_mflags}
+%make_build
%install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+%make_install
-# Fix multiarch stuff
-%ifarch %{multilib_arches}
for header in sysdefs types ; do
mv %{buildroot}%{_includedir}/%{name}/$header.h \
%{buildroot}%{_includedir}/%{name}/$header-%{_arch}.h
- %{__install} -m 0644 -c %{SOURCE1} %{buildroot}%{_includedir}/%{name}/$header.h
- %{__sed} -i -e 's/<HEADER>/'$header'/g'
%{buildroot}%{_includedir}/%{name}/$header.h
+ install -m 0644 -c %{SOURCE1} %{buildroot}%{_includedir}/%{name}/$header.h
+ sed -i -e 's/<HEADER>/'$header'/g'
%{buildroot}%{_includedir}/%{name}/$header.h
touch -r ChangeLog %{buildroot}%{_includedir}/%{name}/$header.h
done
-%{__sed} -i -e '/^LDFLAGS=/d' %{buildroot}%{_bindir}/%{name}-config
+sed -i -e '/^LDFLAGS=/d' %{buildroot}%{_bindir}/%{name}-config
touch -r ChangeLog %{buildroot}%{_bindir}/%{name}-config
-%endif
%ldconfig_scriptlets
%files
-%doc ChangeLog DESIGN README LICENSE
+%license LICENSE
+%doc ChangeLog DESIGN README
%{_libdir}/%{name}.so.*
%files devel
@@ -76,10 +75,12 @@ touch -r ChangeLog %{buildroot}%{_bindir}/%{name}-config
%{_includedir}/%{name}.h
%{_includedir}/%{name}/*.h
%{_datadir}/aclocal/%{name}.m4
-%exclude %{_libdir}/*.la
%exclude %{_libdir}/*.a
%changelog
+* Tue Sep 13 2022 Terje Røsten <terje.rosten(a)ntnu.no> -0.7.1-0.32.20080502cvs
+- Fix for rhbz#2113215
+
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.7.1-0.31.20080502cvs
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit e09fbae0df4713454455d1b8e04ec4006faaa041
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 21 17:20:21 2022 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/libast.spec b/libast.spec
index 14274c9..65ff8ab 100644
--- a/libast.spec
+++ b/libast.spec
@@ -7,7 +7,7 @@
Summary: Library of Assorted Spiffy Things
Name: libast
Version: 0.7.1
-Release: 0.30.%{cvs}cvs%{?dist}
+Release: 0.31.%{cvs}cvs%{?dist}
License: BSD
URL:
http://www.eterm.org/
# Sources are pulled from cvs:
@@ -80,6 +80,9 @@ touch -r ChangeLog %{buildroot}%{_bindir}/%{name}-config
%exclude %{_libdir}/*.a
%changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.7.1-0.31.20080502cvs
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.7.1-0.30.20080502cvs
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild