Update to the new upstream (and new build system; #1170931)
This commit is contained in:
Matěj Cepl
parent
4878d57523
commit
58a20a969d
|
|
@ -1 +1,2 @@
|
|||
sl.tar
|
||||
/sl-5.02.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From dumas Tue Oct 14 10:30:57 2008
|
||||
Date: Tue, 14 Oct 2008 17:30:03 +0900
|
||||
From: Masashi Toyoda < toyoda [AT] tkl.iis (dot) u-tokyo.ac . jp
|
||||
To: Patrice Dumas <pertusus>
|
||||
|
||||
Dear Pat,
|
||||
|
||||
The sl package for Debian/Linux includes the licence term.
|
||||
You can use that if necessary.
|
||||
I understand that I should include that in my source package,
|
||||
and modify the contact information, but I don't have enough time... ;-(
|
||||
|
||||
Best regards,
|
||||
|
||||
M. Toyoda
|
||||
|
||||
> Hello,
|
||||
>
|
||||
> Unless I am missing something, the license for sl is not clearly stated,
|
||||
> at least not clearly stated in english. However there are copyright
|
||||
> notices without license information in sl.c and sl.h which means, under
|
||||
> the Bern Convention, a restrictive license, and I have some doubt that
|
||||
> it is your intention (after all sl is soooo useful :-).
|
||||
>
|
||||
> Could it please be possible for you to clarify the license?
|
||||
>
|
||||
> Also it looks like your email adress changed, maybe it would make sense
|
||||
> to change it in sl.
|
||||
>
|
||||
> --
|
||||
> Pat
|
||||
>
|
||||
>
|
||||
|
||||
|
||||
19
sl.COPYRIGHT
19
sl.COPYRIGHT
|
|
@ -1,19 +0,0 @@
|
|||
The sl package for Debian/Linux includes the licence term.
|
||||
You can use that if necessary.
|
||||
I understand that I should include that in my source package,
|
||||
and modify the contact information, but I don't have enough time... ;-(
|
||||
|
||||
The Debian licence may be found at this url.
|
||||
http://packages.debian.org/changelogs/pool/main/s/sl/sl_3.03-14/sl.copyright
|
||||
|
||||
Upstream Author(s): Toyoda Masashi <toyoda@is.titech.ac.jp>
|
||||
|
||||
Copyright:
|
||||
|
||||
Copyright 1993,1998 Toyoda Masashi (toyoda@is.titech.ac.jp)
|
||||
|
||||
Everyone is permitted to do anything on this program including copying,
|
||||
modifying, and improving, unless you try to pretend that you wrote it.
|
||||
i.e., the above copyright notice has to appear in all copies.
|
||||
THE AUTHOR DISCLAIMS ANY RESPONSIBILITY WITH REGARD TO THIS SOFTWARE.
|
||||
|
||||
33
sl.spec
33
sl.spec
|
|
@ -1,13 +1,11 @@
|
|||
Name: sl
|
||||
Version: 3.03
|
||||
Release: 17%{?dist}
|
||||
Version: 5.02
|
||||
Release: 1%{?dist}
|
||||
Summary: Joke command for when you type 'sl' instead of 'ls'
|
||||
Group: Amusements/Graphics
|
||||
License: Copyright only
|
||||
URL: http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html
|
||||
Source0: http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/%{name}/%{name}.tar
|
||||
Source1: %{name}.COPYRIGHT
|
||||
Source2: http://marcbradshaw.co.uk/packages/review/sl/sl-license-mail.txt
|
||||
URL: https://github.com/mtoyoda/sl
|
||||
Source0: https://github.com/mtoyoda/sl/archive/%{version}/sl-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: ncurses-devel libtermcap-devel
|
||||
|
||||
|
|
@ -21,15 +19,7 @@ terminal when you accidentally type 'sl' instead of 'ls'.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -qn %{name}
|
||||
iconv -f iso-2022-jp README -t utf8 > README.conv && \
|
||||
touch -c -r README README.conv && \
|
||||
mv README.conv README
|
||||
iconv -f iso-2022-jp sl.1 -t utf8 > sl.1.conv && \
|
||||
touch -c -r sl.1 sl.1.conv && \
|
||||
mv sl.1.conv sl.1
|
||||
cp -p %{SOURCE1} COPYRIGHT
|
||||
cp -p %{SOURCE2} sl-license-mail.txt
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags}"
|
||||
|
|
@ -39,8 +29,11 @@ make %{?_smp_mflags} CFLAGS="%{optflags}"
|
|||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
install -m0755 sl %{buildroot}%{_bindir}
|
||||
|
||||
mkdir -p %{buildroot}%{_mandir}/man1
|
||||
install -p -m644 sl.1 %{buildroot}%{_mandir}/man1/
|
||||
mkdir -p %{buildroot}%{_mandir}/ja/man1
|
||||
install -p -m644 sl.1 %{buildroot}%{_mandir}/ja/man1/
|
||||
install -p -m644 sl.1.ja %{buildroot}%{_mandir}/ja/man1/
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
|
@ -48,12 +41,16 @@ rm -rf %{buildroot}
|
|||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README COPYRIGHT sl-license-mail.txt
|
||||
%doc README.ja.md README.md LICENSE
|
||||
%{_mandir}/ja/man1/*
|
||||
%{_mandir}/man1/*
|
||||
%{_bindir}/sl
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 05 2014 Matej Cepl <mcepl@redhat.com> - 5.02-1
|
||||
- Update to the new upstream (and new build system; #1170931)
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.03-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
|
@ -85,7 +82,7 @@ rm -rf %{buildroot}
|
|||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Tue Nov 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 3.03-7
|
||||
- fix license tag (Freely redistributable without restriction is only
|
||||
- fix license tag (Freely redistributable without restriction is only
|
||||
for firmware)
|
||||
|
||||
* Sun Oct 26 2008 Marc Bradshaw <packages@marcbradshaw.co.uk> 3.03-6
|
||||
|
|
|
|||
Loading…
Reference in New Issue