From 941852defe9f1060f5083b235bd713081b5eaab0 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 6 Jan 2025 10:18:31 +0800 Subject: [PATCH] cleanup spec --- bugfix-libidn2-change-rpath.patch | 59 ------------------------------- libidn2-2.3.7.tar.gz.sig | 7 ---- libidn2.spec | 30 +++++----------- libidn2.yaml | 2 +- 4 files changed, 10 insertions(+), 88 deletions(-) delete mode 100644 bugfix-libidn2-change-rpath.patch delete mode 100644 libidn2-2.3.7.tar.gz.sig diff --git a/bugfix-libidn2-change-rpath.patch b/bugfix-libidn2-change-rpath.patch deleted file mode 100644 index eda373e..0000000 --- a/bugfix-libidn2-change-rpath.patch +++ /dev/null @@ -1,59 +0,0 @@ -From cba80c7d0aff8d43ae4d1fde2336560f9315a10c Mon Sep 17 00:00:00 2001 -From: openEuler Buildteam -Date: Wed, 1 Jan 2020 01:57:21 +0800 -Subject: [PATCH] change rpath - ---- - configure | 5 ++++- - m4/libtool.m4 | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index c726942..fe9e5fd 100755 ---- a/configure -+++ b/configure -@@ -14296,6 +14296,9 @@ fi - # before this can be enabled. - hardcode_into_libs=yes - -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command -@@ -14304,7 +14307,7 @@ fi - # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index ee80844..f8ad53d 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -2866,6 +2866,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - # before this can be enabled. - hardcode_into_libs=yes - -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command -@@ -2874,7 +2877,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on --- -1.8.3.1 - diff --git a/libidn2-2.3.7.tar.gz.sig b/libidn2-2.3.7.tar.gz.sig deleted file mode 100644 index ce1cb24..0000000 --- a/libidn2-2.3.7.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHUEABYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCZbTpiAAKCRBRcisI/kdF -ojf1AP0a/xuzeCa1pK+OhbQslaRkxLR3GqH1tGIQocIiqYLwDQD6AitMHqYucJ45 -pN3lzfc+BgM+QX5wfqcWTHhj3YHe+wQ= -=4hS8 ------END PGP SIGNATURE----- diff --git a/libidn2.spec b/libidn2.spec index 32c2e70..8a9ac97 100644 --- a/libidn2.spec +++ b/libidn2.spec @@ -1,17 +1,15 @@ Name: libidn2 Version: 2.3.7 -Release: 1 +Release: 2 Summary: GNU IDN Library License: (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later URL: https://www.gnu.org/software/libidn/#libidn2 Source0: https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz -Patch0: bugfix-libidn2-change-rpath.patch - #Dependency BuildRequires: gcc gettext-devel libunistring-devel autoconf texinfo automake libtool gtk-doc Provides: bundled(gnulib) -Provides: idn2 +Provides: idn2 = %{version}-%{release} Obsoletes: idn2 < %{version}-%{release} %description @@ -21,47 +19,34 @@ Its purpose is to encode and decode internationalized domain names. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} -Requires: pkgconfig %description devel Files for %{name} development %package_help -#Build sections %prep %autosetup -n %{name}-%{version} -p1 -# automake 1.17 -sed -i "s|am__api_version='1.16|am__api_version='1.17|g" configure %build -%configure --disable-static +%configure --disable-static --disable-rpath %make_build %make_build -C doc html %install %make_install %delete_la -make %{?_smp_mflags} -C examples distclean +%make_build -C examples distclean %find_lang %{name} %check -make %{?_smp_mflags} -C tests check - -#Install and uninstall scripts -%pre - -%preun - -%ldconfig_scriptlets +%make_build -C tests check %files -f %{name}.lang %doc AUTHORS NEWS README.md %license COPYING COPYING.LESSERv3 COPYING.unicode COPYINGv2 %{_bindir}/idn2 %{_libdir}/%{name}.so.* -%exclude %{_datadir}/info/dir - %files devel %{_includedir}/*.h @@ -73,9 +58,12 @@ make %{?_smp_mflags} -C tests check %{_mandir}/man1/idn2.1* %{_mandir}/man3/* %{_infodir}/%{name}.info* -%{_datadir}/gtk-doc/ +%{_datadir}/gtk-doc/* %changelog +* Mon Jan 06 2025 Funda Wang - 2.3.7-2 +- cleanup spec + * Fri Jul 19 2024 liweigang - 2.3.7-1 - update to version 2.3.7 diff --git a/libidn2.yaml b/libidn2.yaml index 85a93a0..566657f 100644 --- a/libidn2.yaml +++ b/libidn2.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://git.savannah.gnu.org/cgit/libidn/libidn2.git tag_prefix: ^libidn2- -seperator: . +separator: . -- Gitee