Compare commits

...

23 Commits
f15 ... master

Author SHA1 Message Date
Fedora Release Engineering 48ef137f2a - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 15:28:23 +00:00
Fedora Release Engineering 8a5942563a - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 09:15:48 +00:00
Igor Gnatenko 829fda1c25 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:14 +01:00
Fedora Release Engineering d7bfecfda0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 09:31:29 +00:00
Akira TAGOH 26dbe30a78 Add BR: gcc 2018-02-19 22:34:05 +09:00
Igor Gnatenko 182b2b8842
Escape macros in %changelog
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-09 09:05:05 +01:00
Fedora Release Engineering 51aa595f87 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 00:28:04 +00:00
Fedora Release Engineering 9394e7632d - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 02:51:17 +00:00
Fedora Release Engineering 439581785b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 20:32:20 +00:00
Fedora Release Engineering 152a3a0714 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 20:10:44 +00:00
Dennis Gilmore dfa6345d13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 04:36:58 +00:00
Akira TAGOH 0223a3e030 Use %global instead of %define. 2016-01-04 16:25:24 +09:00
Dennis Gilmore 12db4ae5aa - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 19:09:49 +00:00
Akira TAGOH 7510dcf46b Drop obsolete sigvec support (#1151982) 2014-10-15 16:11:04 +09:00
Peter Robinson 2837db3f17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 08:02:25 +00:00
Dennis Gilmore 4ff798dbcc - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 02:21:46 -05:00
Akira TAGOH 1ea734d845 Fix a typo in %description. (#1053146) 2014-01-15 20:44:21 +09:00
Dennis Gilmore 46ae8bdebf - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 03:31:52 -05:00
Akira TAGOH 9762ef3a06 Rebuilt for aarch64 support (#926100) 2013-03-27 19:08:58 +09:00
Akira TAGOH 6d3d8e192b Rebuilt for aarch64 support (#926100) 2013-03-27 19:01:42 +09:00
Dennis Gilmore 6c79f54cb3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 00:02:12 -06:00
Dennis Gilmore 4b5058c32b - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 17:38:26 -05:00
Dennis Gilmore a85727e5cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 03:04:55 -06:00
3 changed files with 3541 additions and 15 deletions

3390
lv-aarch64.patch Normal file

File diff suppressed because it is too large Load Diff

74
lv-no-sigvec.patch Normal file
View File

@ -0,0 +1,74 @@
--- ./src/configure.in 2004-01-04 22:35:44.000000000 -0800
+++ ./src/configure.in 2014-10-09 11:14:47.782210631 -0700
@@ -34,7 +34,7 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
-AC_CHECK_FUNCS(sigvec tgetnum setlocale)
+AC_CHECK_FUNCS(sigaction tgetnum setlocale)
AC_FUNC_GETPGRP
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIGNAL
--- ./src/console.c 2004-01-04 23:27:46.000000000 -0800
+++ ./src/console.c 2014-10-09 11:16:59.627943378 -0700
@@ -158,9 +158,9 @@ private RETSIGTYPE InterruptHandler( int
{
kb_interrupted = TRUE;
-#ifndef HAVE_SIGVEC
+#ifndef HAVE_SIGACTION
signal( SIGINT, InterruptHandler );
-#endif /* HAVE_SIGVEC */
+#endif /* HAVE_SIGACTION */
}
public void ConsoleEnableInterrupt()
@@ -235,9 +235,9 @@ private RETSIGTYPE WindowChangeHandler(
ConsoleGetWindowSize();
-#ifndef HAVE_SIGVEC
+#ifndef HAVE_SIGACTION
signal( SIGWINCH, WindowChangeHandler );
-#endif /* HAVE_SIGVEC */
+#endif /* HAVE_SIGACTION */
}
#endif /* UNIX */
@@ -388,24 +388,24 @@ public void ConsoleSetUp()
signal( SIGINT, InterruptIgnoreHandler );
#endif /* MSDOS */
-#ifdef HAVE_SIGVEC
- struct sigvec sigVec;
+#ifdef HAVE_SIGACTION
+ struct sigaction sa;
- sigVec.sv_handler = WindowChangeHandler;
- sigVec.sv_mask = sigmask( SIGWINCH );
- sigVec.sv_flags = SV_INTERRUPT;
- sigvec( SIGWINCH, &sigVec, NULL );
-
- sigVec.sv_handler = InterruptHandler;
- sigVec.sv_mask = sigmask( SIGINT );
- sigVec.sv_flags = SV_INTERRUPT;
- sigvec( SIGINT, &sigVec, NULL );
+ sa.sa_handler = WindowChangeHandler;
+ sigemptyset( &sa.sa_mask );
+ sa.sa_flags = 0; /* No SA_RESTART means interrupt syscalls. */
+ sigaction( SIGWINCH, &sa, NULL );
+
+ sa.sa_handler = InterruptHandler;
+ sigemptyset( &sa.sa_mask );
+ sa.sa_flags = 0; /* No SA_RESTART means interrupt syscalls. */
+ sigaction( SIGINT, &sa, NULL );
#else
# ifdef SIGWINCH
signal( SIGWINCH, WindowChangeHandler );
# endif
signal( SIGINT, InterruptHandler );
-#endif /* HAVE_SIGVEC */
+#endif /* HAVE_SIGACTION */
#ifdef UNIX
#ifdef HAVE_TERMIOS_H

92
lv.spec
View File

@ -1,12 +1,12 @@
%define vver 451 %global vver 451
Name: lv Name: lv
Version: 4.51 Version: 4.51
Release: 16%{?dist} Release: 36%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.ff.iij4u.or.jp/~nrt/lv/ URL: http://www.ff.iij4u.or.jp/~nrt/lv/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel autoconf BuildRequires: ncurses-devel autoconf
BuildRequires: gcc
Source: http://www.ff.iij4u.or.jp/~nrt/freeware/%{name}%{vver}.tar.gz Source: http://www.ff.iij4u.or.jp/~nrt/freeware/%{name}%{vver}.tar.gz
Patch1: lv-4.49.4-nonstrip.patch Patch1: lv-4.49.4-nonstrip.patch
@ -14,9 +14,10 @@ Patch2: lv-4.51-162372.patch
Patch3: lv-+num-option.patch Patch3: lv-+num-option.patch
Patch4: lv-fastio.patch Patch4: lv-fastio.patch
Patch5: lv-lfs.patch Patch5: lv-lfs.patch
Patch6: %{name}-aarch64.patch
Patch7: %{name}-no-sigvec.patch
Summary: A Powerful Multilingual File Viewer Summary: A Powerful Multilingual File Viewer
Group: Applications/Text
%description %description
lv is a powerful file viewer like less. lv is a powerful file viewer like less.
lv can decode and encode multilingual streams through lv can decode and encode multilingual streams through
@ -25,7 +26,7 @@ HZ, Unicode.
It recognizes multi-bytes patterns as regular It recognizes multi-bytes patterns as regular
expressions, lv also provides multilingual grep. expressions, lv also provides multilingual grep.
In addition, lv can recognize ANSI escape sequences In addition, lv can recognize ANSI escape sequences
for text devoration. for text decoration.
%prep %prep
%setup -q -n %{name}%{vver} %setup -q -n %{name}%{vver}
@ -34,6 +35,8 @@ for text devoration.
%patch3 -p1 -b .num %patch3 -p1 -b .num
%patch4 -p1 -b .fastio %patch4 -p1 -b .fastio
%patch5 -p1 -b .lfs %patch5 -p1 -b .lfs
%patch6 -p1 -b .6-aarch64
%patch7 -p1 -b .7-sigvec
%build %build
cd src cd src
@ -42,26 +45,85 @@ autoconf
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT
cd src cd src
%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
make install bindir=$RPM_BUILD_ROOT%{_bindir} libdir=$RPM_BUILD_ROOT%{_libdir} mandir=$RPM_BUILD_ROOT%{_mandir} make install bindir=$RPM_BUILD_ROOT%{_bindir} libdir=$RPM_BUILD_ROOT%{_libdir} mandir=$RPM_BUILD_ROOT%{_mandir} INSTALL="install -p"
%files %files
%defattr(-, root, root) %license GPL.txt
%doc GPL.txt README build hello.sample hello.sample.gif index.html %doc README build hello.sample hello.sample.gif index.html
%doc relnote.html %doc relnote.html
%{_bindir}/lv %{_bindir}/lv
%{_bindir}/lgrep %{_bindir}/lgrep
%{_mandir}/man1/lv.1.gz %{_mandir}/man1/lv.1.gz
%{_libdir}/lv %{_libdir}/lv
%clean
rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Feb 19 2018 Akira TAGOH <tagoh@redhat.com> - 4.51-33
- Add BR: gcc
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.51-32
- Escape macros in %%changelog
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.51-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Jan 4 2016 Akira TAGOH <tagoh@redhat.com>
- Use %%global instead of %%define.
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Oct 15 2014 Akira TAGOH <tagoh@redhat.com> - 4.51-25
- Drop obsolete sigvec support (#1151982)
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Jan 15 2014 Akira TAGOH <tagoh@redhat.com> - 4.51-22
- Fix a typo in %%description. (#1053146)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Mar 27 2013 Akira TAGOH <tagoh@redhat.com> - 4.51-20
- Rebuilt for aarch64 support (#926100)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-16 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.51-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@ -205,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT
- fix spec (remove japanese description) - fix spec (remove japanese description)
* Mon Aug 07 2000 SATO Satoru <ssato@redhat.com> * Mon Aug 07 2000 SATO Satoru <ssato@redhat.com>
- fix spec (make prefix... replaced with %makeinstall) - fix spec (make prefix... replaced with %%makeinstall)
* Tue Jul 04 2000 SATO Satoru <ssato@redhat.com> * Tue Jul 04 2000 SATO Satoru <ssato@redhat.com>
- initial release. - initial release.