[packages/texi2html] - don't install perl-libintl and perl-Unicode-EastAsianWidth, patches from Fedora - disable debugsou

hawk hawk at pld-linux.org
Fri Dec 15 02:32:27 CET 2023 

commit d307112c0c70c9fb66b1c728024ecb4fae20a318
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Fri Dec 15 00:36:20 2023 +0100

    - don't install perl-libintl and perl-Unicode-EastAsianWidth, patches from Fedora
    - disable debugsource

 texi2html-Unicode-EastAsianWidth.patch | 38 +++++++++++++++++++++++++++
 texi2html-libintl.patch                | 48 ++++++++++++++++++++++++++++++++++
 texi2html.spec                         | 10 ++++++-
 3 files changed, 95 insertions(+), 1 deletion(-)
---
diff --git a/texi2html.spec b/texi2html.spec
index 1cf670c..bb63b78 100644
--- a/texi2html.spec
+++ b/texi2html.spec
@@ -4,13 +4,15 @@ Summary(hu.UTF-8):	texi2html egy Perl szkript, amely Texinfo fájlokat konvertá
 Summary(pl.UTF-8):	texi2html - skrypt Perla konwertujący pliki Texinfo do HTML-a
 Name:		texi2html
 Version:	5.0
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	http://download.savannah.gnu.org/releases/texi2html/%{name}-%{version}.tar.bz2
 # Source0-md5:	f15ac876fcdc8be865b16535f480aa54
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-perl.patch
+Patch2:		%{name}-Unicode-EastAsianWidth.patch
+Patch3:		%{name}-libintl.patch
 URL:		http://www.nongnu.org/texi2html/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
@@ -26,6 +28,10 @@ Suggests:	perl-Encode
 Suggests:	perl-Text-Unidecode
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# Package should be noarch but configure will fail with error:
+# Invalid configuration `noarch-pld-linux': machine `noarch-pld' not recognized
+%define		_debugsource_packages	0
+
 %description
 texi2html is a Perl script that converts Texinfo files to HTML.
 
@@ -39,6 +45,8 @@ texi2html to skrypt Perla konwertujący pliki Texinfo do HTML-a.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
diff --git a/texi2html-Unicode-EastAsianWidth.patch b/texi2html-Unicode-EastAsianWidth.patch
new file mode 100644
index 0000000..a2b7eb9
--- /dev/null
+++ b/texi2html-Unicode-EastAsianWidth.patch
@@ -0,0 +1,38 @@
+From 91a0efcf09a95c0a3e74ca4e1d6225a860e010d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 22 Oct 2014 09:43:25 +0200
+Subject: [PATCH] Do not install Unicode-EastAsianWidth if external is used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Configuration --with-external-Unicode-EastAsianWidth=yes should not
+install the bundled Unicode-EastAsianWidth code. This patch fixes it.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Makefile.am | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3447463..bc3257b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -267,9 +267,11 @@ install-data-local: i18n
+ 	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
+ 	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
+ 	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
+-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
+-	$(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
+-	 $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
++	if test '$(USE_EXTERNAL_EASTASIANWIDTH)' != 'yes'; then \
++	  $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode ; \
++	  $(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
++	    $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode ; \
++	fi
+ 
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(pkgdatadir)/lib/ $(DESTDIR)$(pkgdatadir)/i18n
+-- 
+1.9.3
+
diff --git a/texi2html-libintl.patch b/texi2html-libintl.patch
new file mode 100644
index 0000000..bc0730b
--- /dev/null
+++ b/texi2html-libintl.patch
@@ -0,0 +1,48 @@
+From 68e345ada811cdea2d9ccf056001e15f6e2316a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 22 Oct 2014 10:30:16 +0200
+Subject: [PATCH] Do not install libintl-perl if external is used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Configuration --with-external-libintl-perl=yes should not
+install the bundled libintl-perl code. This patch fixes it.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ Makefile.am | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bc3257b..37dfd0f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -259,14 +259,16 @@ distclean-local:
+ install-data-local: i18n
+ 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/i18n
+ 	$(INSTALL_DATA) i18n/*.thl  $(DESTDIR)$(pkgdatadir)/i18n
+-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
++	if test '$(USE_EXTERNAL_LIBINTL)' != 'yes'; then \
++	  $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
++	    $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData ;\
++	  $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
++	    $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale ; \
++	  $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \
++	    $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode ; \
++	  $(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
++	    $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData ; \
++	fi
+ 	if test '$(USE_EXTERNAL_EASTASIANWIDTH)' != 'yes'; then \
+ 	  $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode ; \
+ 	  $(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
+-- 
+1.9.3
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/texi2html.git/commitdiff/d307112c0c70c9fb66b1c728024ecb4fae20a318

More information about the pld-cvs-commit mailing list