[packages/sl] - up to 5.02

arekm arekm at pld-linux.org
Sat Dec 12 17:51:30 CET 2015


commit def0e81747f0bc8a223b877c7e664cf7bd8a5cd8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Dec 12 17:51:26 2015 +0100

    - up to 5.02

 sl-am.patch   | 14 --------------
 sl-code.patch | 20 --------------------
 sl.spec       | 38 ++++++++++++++++----------------------
 3 files changed, 16 insertions(+), 56 deletions(-)
---
diff --git a/sl.spec b/sl.spec
index 4a77add..4f0c26b 100644
--- a/sl.spec
+++ b/sl.spec
@@ -1,16 +1,12 @@
 Summary:	A nice animation wich appears when you mistype the ls command
 Summary(pl.UTF-8):	Fajna animacja, która się pojawia przy błędnym wpisaniu ls
 Name:		sl
-Version:	3.03
-Release:	5
+Version:	5.02
+Release:	1
 License:	GPL
 Group:		Applications/Text
-Source0:	http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/%{name}/%{name}.tar
-# Source0-md5:	cc06b159f78f86bfd2d4e0e16330fbae
-Source1:	%{name}-debian.tar.gz
-# Source1-md5:	a13934db014b77267f1a7109588d4255
-Patch0:		%{name}-am.patch
-Patch1:		%{name}-code.patch
+Source0:	https://github.com/mtoyoda/sl/archive/%{version}.tar.gz
+# Source0-md5:	5d5fe203eb19598821647ba8db5dde6c
 URL:		http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/
 BuildRequires:	ncurses-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -20,34 +16,32 @@ When you type sl instead of ls, you will be greeted with a nice and
 relaxing animation of a train going by...
 
 %description -l pl.UTF-8
-Jeżeli wpiszesz sl, zamiast ls, zostaniesz powitany fajną
-i relaksującą animacja przejeżdżającego pociągu...
+Jeżeli wpiszesz sl, zamiast ls, zostaniesz powitany fajną i
+relaksującą animacja przejeżdżającego pociągu...
 
 %prep
-%setup -q -n %{name} -a1
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcppflags} %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{ja/,}man6}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{ja/,}man1}
 
 install sl $RPM_BUILD_ROOT%{_bindir}
-install sl-debian/sl.6 $RPM_BUILD_ROOT%{_mandir}/man6
-install sl-debian/sl.6j $RPM_BUILD_ROOT%{_mandir}/ja/man6/sl.6
+install sl.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install sl.1.ja $RPM_BUILD_ROOT%{_mandir}/ja/man1/sl.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc sl-debian/README
-%lang(ja) %doc sl-debian/README.jp
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man6/*
-%lang(ja) %{_mandir}/ja/man6/*
+%doc README.md
+%lang(ja) %doc README.ja.md
+%attr(755,root,root) %{_bindir}/sl
+%{_mandir}/man1/sl.1*
+%lang(ja) %{_mandir}/ja/man1/sl.1*
diff --git a/sl-am.patch b/sl-am.patch
deleted file mode 100644
index 7a40161..0000000
--- a/sl-am.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN sl-3.03.orig/Makefile sl-3.03/Makefile
---- sl-3.03.orig/Makefile	Wed Jul 22 16:00:41 1998
-+++ sl-3.03/Makefile	Sun Sep 29 16:23:29 2002
-@@ -9,6 +9,8 @@
- CFLAGS=-O
- 
- sl: sl.c sl.h
--	$(CC) $(CFLAGS) -o sl sl.c -lcurses -ltermcap
-+	$(CC) $(CFLAGS) -o sl sl.c -I/usr/include/ncurses -lcurses
- #	$(CC) $(CFLAGS) -o sl sl.c -lcurses
--
-+clean: 
-+	rm -rf *.o
-+	rm -rf sl
diff --git a/sl-code.patch b/sl-code.patch
deleted file mode 100644
index d9d6bf6..0000000
--- a/sl-code.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN sl-3.03.orig/sl.c sl-3.03/sl.c
---- sl-3.03.orig/sl.c	Wed Jul 22 16:01:01 1998
-+++ sl-3.03/sl.c	Sun Sep 29 16:21:23 2002
-@@ -59,7 +59,7 @@
-     }
- }
- 
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
-     int x, i;
- 
-@@ -85,6 +85,7 @@
-     }
-     mvcur(0, COLS - 1, LINES - 1, 0);
-     endwin();
-+return 0;
- }
- 
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sl.git/commitdiff/def0e81747f0bc8a223b877c7e664cf7bd8a5cd8



More information about the pld-cvs-commit mailing list