Compare commits
No commits in common. "c9s" and "c8s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
pinfo-0.6.10.tar.bz2
|
SOURCES/pinfo-0.6.10.tar.bz2
|
||||||
|
/pinfo-0.6.10.tar.bz2
|
||||||
|
@ -1 +0,0 @@
|
|||||||
24c8cf74b7443614c8f4a23e2557853732045dfa pinfo-0.6.10.tar.bz2
|
|
27
0001-Make-sure-sbrk-is-defined-in-unistd.patch
Normal file
27
0001-Make-sure-sbrk-is-defined-in-unistd.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From b0fdc30500ddd271ec263b5b1c2eacf86ff73461 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "bas@zoetekouw.net" <bas@zoetekouw.net>
|
||||||
|
Date: Mon, 7 Aug 2017 22:58:43 +0200
|
||||||
|
Subject: [PATCH] Make sure sbrk() is defined in unistd
|
||||||
|
|
||||||
|
---
|
||||||
|
src/common_includes.h | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/common_includes.h b/src/common_includes.h
|
||||||
|
index a4593d3..fb3148c 100644
|
||||||
|
--- a/src/common_includes.h
|
||||||
|
+++ b/src/common_includes.h
|
||||||
|
@@ -22,6 +22,10 @@
|
||||||
|
#ifndef __COMMON_INCLUDES_H
|
||||||
|
#define __COMMON_INCLUDES_H
|
||||||
|
|
||||||
|
+/* make sure unistd.h defines sbrk() */
|
||||||
|
+#define _DEFAULT_SOURCE 1
|
||||||
|
+#define _BSD_SOURCE 1
|
||||||
|
+
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <strings.h>
|
||||||
|
--
|
||||||
|
2.14.4
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up pinfo-0.6.10/src/parse_config.h.me pinfo-0.6.10/src/parse_config.h
|
|
||||||
--- pinfo-0.6.10/src/parse_config.h.me 2020-02-24 16:01:08.119884715 +0100
|
|
||||||
+++ pinfo-0.6.10/src/parse_config.h 2020-02-24 16:01:19.396990442 +0100
|
|
||||||
@@ -85,7 +85,7 @@ typedef struct colours
|
|
||||||
colours;
|
|
||||||
#endif /* NO_COLOR_CURSES */
|
|
||||||
|
|
||||||
-int use_manual;
|
|
||||||
+extern int use_manual;
|
|
||||||
|
|
||||||
int parse_config (void);
|
|
||||||
int parse_line (char *line);
|
|
@ -1,22 +0,0 @@
|
|||||||
--- a/macros/curses.m4
|
|
||||||
+++ b/macros/curses.m4
|
|
||||||
@@ -257,8 +257,8 @@
|
|
||||||
dnl save CFLAGS and LDFLAGS and set new ones
|
|
||||||
CFLAGS_OLD=$CFLAGS
|
|
||||||
CFLAGS="$CFLAGS $curses_includes"
|
|
||||||
- LDFLAGS_OLD=$LDFLAGS
|
|
||||||
- LDFLAGS="$LDFLAGS $curses_libs"
|
|
||||||
+ LIBS_OLD=$LIBS
|
|
||||||
+ LIBS="$LIBS $curses_libs"
|
|
||||||
|
|
||||||
dnl do the compile test
|
|
||||||
AC_MSG_CHECKING([if curses is usable])
|
|
||||||
@@ -288,7 +288,7 @@
|
|
||||||
|
|
||||||
dnl restore variables
|
|
||||||
CFLAGS=$CFLAGS_OLD
|
|
||||||
- LDFLAGS=$LDFLAGS_OLD
|
|
||||||
+ LIBS=$LIBS_OLD
|
|
||||||
|
|
||||||
])
|
|
||||||
|
|
78
pinfo.spec
78
pinfo.spec
@ -1,7 +1,8 @@
|
|||||||
Summary: An info file viewer
|
Summary: An info file viewer
|
||||||
Name: pinfo
|
Name: pinfo
|
||||||
Version: 0.6.10
|
Version: 0.6.10
|
||||||
Release: 29%{?dist}
|
Release: 18%{?dist}
|
||||||
|
Group: System Environment/Base
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://pinfo.alioth.debian.org
|
URL: http://pinfo.alioth.debian.org
|
||||||
Source: http://alioth.debian.org/frs/download.php/3351/pinfo-0.6.10.tar.bz2
|
Source: http://alioth.debian.org/frs/download.php/3351/pinfo-0.6.10.tar.bz2
|
||||||
@ -11,13 +12,15 @@ Patch3: pinfo-0.6.9-nogroup.patch
|
|||||||
Patch4: pinfo-0.6.9-mansection.patch
|
Patch4: pinfo-0.6.9-mansection.patch
|
||||||
Patch5: pinfo-0.6.9-infopath.patch
|
Patch5: pinfo-0.6.9-infopath.patch
|
||||||
Patch6: pinfo-0.6.10-man.patch
|
Patch6: pinfo-0.6.10-man.patch
|
||||||
Patch7: pinfo-0.6.9-as-needed.patch
|
Patch7: 0001-Make-sure-sbrk-is-defined-in-unistd.patch
|
||||||
Patch8: pinfo-0.6.10-gcc10.patch
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: automake gettext-devel libtool texinfo
|
BuildRequires: automake gettext-devel libtool texinfo
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
|
# for /sbin/install-info
|
||||||
|
Requires(post): info
|
||||||
|
Requires(preun): info
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Pinfo is an info file (or man page) viewer with a user interface
|
Pinfo is an info file (or man page) viewer with a user interface
|
||||||
@ -25,15 +28,24 @@ similar to the Lynx Web browser's interface. Pinfo supports searching
|
|||||||
using regular expressions, and is based on the ncurses library.
|
using regular expressions, and is based on the ncurses library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
|
%patch1 -p1 -b .xdg
|
||||||
|
%patch2 -p1 -b .infosuff
|
||||||
|
%patch3 -p1 -b .nogroup
|
||||||
|
%patch4 -p1 -b .mansection
|
||||||
|
%patch5 -p1 -b .infopath
|
||||||
|
%patch6 -p1 -b .man
|
||||||
|
%patch7 -p1 -b .sbrk
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
%configure --without-readline
|
%configure --without-readline
|
||||||
%make_build
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
make DESTDIR=$RPM_BUILD_ROOT install
|
||||||
# These symbolic links conflict with actual binaries in perl-pmtools (bz 437612)
|
# These symbolic links conflict with actual binaries in perl-pmtools (bz 437612)
|
||||||
# ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman
|
# ln -sf pinfo $RPM_BUILD_ROOT%{_bindir}/pman
|
||||||
# ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1
|
# ln -sf pinfo.1 $RPM_BUILD_ROOT%{_mandir}/man1/pman.1
|
||||||
@ -44,6 +56,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
|
%defattr(-,root,root)
|
||||||
%doc AUTHORS COPYING ChangeLog* NEWS README TECHSTUFF
|
%doc AUTHORS COPYING ChangeLog* NEWS README TECHSTUFF
|
||||||
%config(noreplace) %{_sysconfdir}/pinforc
|
%config(noreplace) %{_sysconfdir}/pinforc
|
||||||
%{_bindir}/pinfo
|
%{_bindir}/pinfo
|
||||||
@ -52,43 +65,22 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|||||||
%{_mandir}/man1/pinfo.1*
|
%{_mandir}/man1/pinfo.1*
|
||||||
# %{_mandir}/man1/pman.1*
|
# %{_mandir}/man1/pman.1*
|
||||||
|
|
||||||
|
%post
|
||||||
|
/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir &> /dev/null
|
||||||
|
:
|
||||||
|
|
||||||
|
%preun
|
||||||
|
if [ $1 = 0 ]; then
|
||||||
|
/sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir &> /dev/null
|
||||||
|
fi
|
||||||
|
:
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.6.10-29
|
* Mon Jul 23 2018 Lukas Nykryn <lnykryn@redhat.com> - 0.6.10-18
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- fix missing declaration of function 'sbrk'
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.6.10-28
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-27
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-26
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Feb 24 2020 Than Ngo <than@redhat.com> - 0.6.10-25
|
|
||||||
- Fixed FTBFS
|
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-24
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-23
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Mar 01 2019 Lukas Nykryn <lnykryn@redhat.com> - 0.6.10-22
|
|
||||||
- fix ftbfs
|
|
||||||
|
|
||||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-21
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.6.10-20
|
|
||||||
- Rebuild with fixed binutils
|
|
||||||
|
|
||||||
* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.10-19
|
|
||||||
- Replace obsolete scriptlets
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-18
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-17
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.10-17
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
Loading…
Reference in New Issue
Block a user