!22 [sync] PR-19: Add version number for Obsoletes

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

autogen.spec

@@ -1,15 +1,18 @@
 Name:		autogen
-Version:	5.18.14
-Release:	4
+Version:	5.18.16
+Release:	5
 License:	GPLv2+ and GPLv3+
 Summary:	Automated text file generator
 URL:		http://www.gnu.org/software/autogen/
 Provides:	autogen-libopts
-Obsoletes:	autogen-libopts
+Obsoletes:	autogen-libopts < %{version}-%{release}
 Source0:	http://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
 
+Patch0:	backport-fix-stray-blanking-of-config-file-char.patch
+
 BuildRequires:	gcc guile-devel libtool libxml2-devel
 BuildRequires:	perl-generators
+BuildRequires:  chrpath
 
 %description
 AutoGen is a tool designed to simplify the creation and maintenance of
@@ -24,7 +27,7 @@ License:	LGPLv3+
 Requires:	automake autogen pkgconfig
 Provides:	autogen-libopts-devel
 Provides:	pkgconfig(autoopts)
-Obsoletes:	autogen-libopts-devel
+Obsoletes:	autogen-libopts-devel < %{version}-%{release}
 
 %description    devel
 This package contains development files for autogen.
@@ -42,8 +45,13 @@ Man pages and other related documents.
 
 %build
 # Static libraries are needed to run test-suite.
-export CFLAGS="$RPM_OPT_FLAGS -Wno-implicit-fallthrough -Wno-format-overflow \
+CFLAGS="$RPM_OPT_FLAGS -Wno-implicit-fallthrough -Wno-format-overflow \
 		-Wno-format-truncation"
+%if "%toolchain" == "clang"
+CFLAGS+=" -Wno-missing-field-initializers -Wno-format "
+%endif
+export CFLAGS
+
 %configure
 
 # Omit unused direct shared library dependencies.
@@ -56,6 +64,13 @@ make check
 
 %install
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
+
+#Remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/{columns,getdefs,%{name},xml2ag}
+
+mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo "%{_libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %delete_la_and_a
 
 
@@ -72,6 +87,7 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
 %{_libdir}/libopts.so.25*
+%config(noreplace) /etc/ld.so.conf.d/*
 
 %files devel
 %{_bindir}/autoopts-config
@@ -93,6 +109,21 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 %exclude %{_infodir}/dir
 
 %changelog
+* Thu Jul 11 2024 huyubiao <huyubiao@huawei.com> - 5.18.16-5
+- Add version number for Obsoletes
+
+* Thu Feb 1 2024 liyunfei<liyunfei33@huawei.com> - 5.18.16-4
+- add additional warning options for clang
+
+* Tue Oct 18 2022 zhangruifang <zhangruifang1@h-partners.com> - 5.18.16-3
+- fix stray blanking of config file char
+
+* Thu Jul 28 2022 zoulin <zoulin13@h-partners.com> - 5.18.16-2
+- remove rpath and runpath of exec files and libraries
+
+* Thu Jul 16 2020 wangchen <wangchen137@huawei.com> - 5.18.16-1
+- Update to 5.18.16
+
 * Mon Dec 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.18.14-4
 - Modify Source
 

autogen.yaml

@@ -1,4 +1,4 @@
 version_control: git
-src_repo: https://git.code.sf.net/p/autogen/code
+src_repo: https://git.savannah.gnu.org/git/autogen.git
 tag_prefix: ^v
-seperator: "-"
+seperator: "." 

backport-fix-stray-blanking-of-config-file-char.patch

@@ -0,0 +1,38 @@
+From 3b33eb2fc09a2d7221da6bc7159f374fdef8906a Mon Sep 17 00:00:00 2001
+From: Bruce Korb <bkorb@gnu.org>
+Date: Fri, 6 Sep 2019 08:28:00 -0700
+Subject: [PATCH] fix stray blanking of config file char
+
+* autoopts/configfile.c (trim_xml_text): remove unnecessary and
+  occasionally destructive blanking of first character.
+---
+ autoopts/configfile.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autoopts/configfile.c b/autoopts/configfile.c
+index 783a9d8a..e8f557ad 100644
+--- a/autoopts/configfile.c
++++ b/autoopts/configfile.c
+@@ -802,10 +802,9 @@ trim_xml_text(char * intxt, char const * pznm, tOptionLoadMode mode)
+         pz[1] = '/';
+         memcpy(pz+2, pznm, nm_len);
+         nm_len  += 2;
+-        pz[nm_len++] = '>';
++        pz[nm_len++] = '>'; // nm_len is now length of end mark
+         pz[nm_len]   = NUL;
+ 
+-        *intxt = ' ';
+         etext = strstr(intxt, pz);
+         if (pz != z) AGFREE(pz);
+     }
+@@ -825,6 +824,7 @@ trim_xml_text(char * intxt, char const * pznm, tOptionLoadMode mode)
+ }
+ 
+ /**
++ * process hex and amphersand encoded characters.
+  */
+ static void
+ cook_xml_text(char * pzData)
+-- 
+2.27.0
+