This commit is contained in:
Tom Callaway 2023-02-23 15:24:51 -05:00
parent 863671ac00
commit 17d19449f6
4 changed files with 33 additions and 4 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ libpaper_1.1.24.tar.gz
/libpaper_1.1.28.tar.gz
/libpaper-2.0.4.tar.gz
/libpaper-2.0.8.tar.gz
/libpaper-2.0.9.tar.gz

View File

@ -0,0 +1,24 @@
diff -up libpaper-2.0.9/configure.ac.fix libpaper-2.0.9/configure.ac
--- libpaper-2.0.9/configure.ac.fix 2023-02-23 15:03:28.780772074 -0500
+++ libpaper-2.0.9/configure.ac 2023-02-23 15:03:34.308841516 -0500
@@ -134,6 +134,9 @@ AC_PATH_PROG([HELP2MAN], [help2man], [he
CROSS_COMPILING=$cross_compiling
AC_SUBST([CROSS_COMPILING])
+dnl Perl is needed for x-to-1
+AC_PATH_PROG([PERL], [perl], [perl])
+
dnl Create files
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([
diff -up libpaper-2.0.9/man/Makefile.am.fix libpaper-2.0.9/man/Makefile.am
--- libpaper-2.0.9/man/Makefile.am.fix 2023-02-23 15:03:57.583133885 -0500
+++ libpaper-2.0.9/man/Makefile.am 2023-02-23 15:04:39.738663438 -0500
@@ -37,6 +37,6 @@ paper.1.in: $(abs_top_srcdir)/src/paper.
## Exit gracefully if $@ is not writeable, such as during distcheck!
$(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
$(top_builddir)/build-aux/x-to-1 \
- $(PERL) $(HELP2MAN) --no-info --no-discard-stderr \
+ $(PERL) "$(HELP2MAN) --no-info --no-discard-stderr" \
$(abs_top_builddir)/src/paper$(EXEEXT) paper.x $@; \
fi

View File

@ -1,5 +1,5 @@
Name: libpaper
Version: 2.0.8
Version: 2.0.9
Release: 1%{?dist}
# Needed to replace separate paper package
Epoch: 1
@ -9,6 +9,9 @@ URL: https://github.com/rrthomas/libpaper/
Source0: https://github.com/rrthomas/libpaper/archive/v%{version}/%{name}-%{version}.tar.gz
# Pulled from paper
Source1: localepaper.c
# Fix perl detection and arg quoting so that x-to-1 invokes properly
# https://github.com/rrthomas/libpaper/pull/41
Patch0: libpaper-2.0.9-x-to-1-fix.patch
# gcc is no longer in buildroot by default
BuildRequires: gcc
@ -48,12 +51,10 @@ default paper size and give information about known sizes.
%autosetup -S git
cp %{SOURCE1} src/
%if 0
sed -i 's|gnulib_tool=$gnulib_path/gnulib-tool|gnulib_tool=%{_bindir}/gnulib-tool|g' bootstrap
sed -i 's|./gnulib/gnulib-tool|%{_bindir}/gnulib-tool|g' bootstrap.conf
sed -i '/doc\/INSTALL/d' bootstrap
./bootstrap --gnulib-srcdir=%{_datadir}/gnulib/ --skip-git
%endif
%build
%configure --disable-static
@ -107,6 +108,9 @@ install -m0755 src/localepaper %{buildroot}%{_libexecdir}
%{_mandir}/man5/*
%changelog
* Thu Feb 23 2023 Tom Callaway <spot@fedoraproject.org> - 1:2.0.9-1
- update to 2.0.9
* Tue Feb 14 2023 Tom Callaway <spot@fedoraproject.org> - 1:2.0.8-1
- update to 2.0.8

View File

@ -1 +1 @@
SHA512 (libpaper-2.0.8.tar.gz) = 06318779cee2d1cf9bea090a5956f90bf8cccc0d753eb7c931615c0dcb321e012ea870a20613b84e7f4350ab608237a2d21d5170c119d8908c86a94e0cba1d1f
SHA512 (libpaper-2.0.9.tar.gz) = 8f5bcc3ceae66d94240822bbd3044050706d87c74386621aed1b4cfec6aac6b62f55c8b3d4c8ad9516320cf51ce3787130843cf159e487dfaef235a9657655c7