[saphire] 3.6.5 License changed from GPL+ to MIT
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Jan 10 09:08:22 UTC 2012
commit bc4f7cc7e876c4d988fdc315ae62edb194d4c99c
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Tue Jan 10 18:08:18 2012 +0900
3.6.5
License changed from GPL+ to MIT
.gitignore | 1 +
saphire.spec | 74 ++++++++++++++++++++++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 56 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8787576..2ef1887 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
/saphire-3.6.2.tgz
/saphire-3.6.3.tgz
/saphire-3.6.4.tgz
+/saphire-3.6.5.tgz
diff --git a/saphire.spec b/saphire.spec
index 836d8a4..14cac22 100644
--- a/saphire.spec
+++ b/saphire.spec
@@ -1,13 +1,13 @@
-%global repoid 54193
+%global repoid 54458
Name: saphire
-Version: 3.6.4
-Release: 2%{?dist}
+Version: 3.6.5
+Release: 1%{?dist}
Summary: Yet another shell
Group: System Environment/Shells
-License: GPL+
+License: MIT
URL: http://ab25cq.wiki.fc2.com/
Source0: http://dl.sourceforge.jp/sash/%{repoid}/saphire-%{version}.tgz
@@ -49,11 +49,13 @@ sed -i.stamp \
Makefile.in
# Umm...
sed -i.soname \
- -e '/[ \t]/s|\( -o libsaphire.so.1.0 \)| -Wl,-soname,libsaphire.so.1 \1|' \
+ -e '/[ \t]/s|\( -o libsaphire.so.2.0.0 \)| -Wl,-soname,libsaphire.so.2 \1|' \
Makefile.in
# FIX CRLF
for file in \
+ CHANGELOG.txt \
+ README*.txt \
USAGE.*.txt
do
sed -i.dos -e 's|\r||' $file
@@ -61,6 +63,19 @@ do
rm $file.dos
done
+# Some encodings or so fixes
+pushd headers/saphire
+for f in *.h
+do
+ touch -r $f $f.stamp
+ iconv -f EUC-JP -t UTF-8 $f > $f.utf8 && mv -f $f.utf8 $f || rm -f $f.utf8
+ iconv -f SHIFT-JIS -t UTF-8 $f > $f.utf8 && mv -f $f.utf8 $f || rm -f $f.utf8
+ dos2unix $f
+ touch -r $f.stamp $f
+ rm -f $f.stamp
+done
+popd
+
# Prefer less over lv
sed -i.pager \
-e 's| lv| less|' \
@@ -73,9 +88,8 @@ sed -i.pager \
%configure \
--with-migemo \
--with-system-migemodir=%{_datadir}/cmigemo \
- --sysconfdir=%{_libdir}/%{name} \
- --docdir=%{_defaultdocdir}/%{name}-%{version} \
- --includedir=%{_includedir}/%{name}
+ --sysconfdir=%{_libdir}/ \
+ --docdir=%{_defaultdocdir}/%{name}-%{version}
# configure overrides $CFLAGS
# Kill parallel make
@@ -85,16 +99,25 @@ make -j1 \
docdir=%{_defaultdocdir}/%{name}-%{version} \
-k
+# Samples
+rm -rf install_samples/
+mkdir -p install_samples/samples
+cp -p samples/*sa install_samples/samples
+
+pushd install_samples/samples
+chmod 0644 *.sa
+sed -i \
+ -e '\@^#!/usr.*@d' \
+ -e '\@^#!/home.*@d' \
+ *.sa
+popd
+
%install
-# Unfortunately, this Makefile.in does not honor DESTDIR, so
-# let's use %%makeinstall :(
-# docdir is to be cleaned up with %%doc, however specify it
-# anyway for consistency
-%makeinstall \
- lib-install \
- sysconfdir=%{buildroot}%{_libdir}/%{name} \
- docdir=%{buildroot}%{_defaultdocdir}/%{name}-%{version} \
- includedir=%{buildroot}%{_includedir}/%{name}
+make install \
+ DESTDIR=%{buildroot} \
+ includedir=%{_includedir}/%{name} \
+ docdir=%{_defaultdocdir}/%{name}-%{version}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -102,26 +125,37 @@ make -j1 \
%files
%defattr(-,root,root,-)
%doc AUTHORS
-%doc GPL
+%doc LICENSE
%doc README.en.txt
%doc USAGE.en.txt
+%doc install_samples/samples
%lang(ja) %doc CHANGELOG.txt
%lang(ja) %doc README.ja.txt
+#%%lang(ja) %doc TODO.ja.txt
%lang(ja) %doc USAGE.ja.txt
%{_bindir}/%{name}
%{_bindir}/saphiresh
-%{_libdir}/lib%{name}.so.1*
+%{_libdir}/lib%{name}.so.2*
%dir %{_libdir}/%{name}/
%{_libdir}/%{name}/%{name}.sa*
%{_libdir}/%{name}/completion.sa*
+%{_libdir}/%{name}/shelp.sa*
+
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/saphiresh.1*
%files devel
%defattr(-,root,root,-)
-%{_includedir}/%{name}/
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
%{_libdir}/lib%{name}.so
%changelog
+* Tue Jan 10 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3.6.5-1
+- 3.6.5
+- License changed from GPL+ to MIT
+
* Thu Jan 5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3.6.4-2
- F-17: rebuild against gcc47
diff --git a/sources b/sources
index 7270f5f..b63a739 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c8e9efa05a4b49f6d2c736c689dc5a4 saphire-3.6.4.tgz
+0c2c595c6ba616ded997bdbfb68e5e1c saphire-3.6.5.tgz
More information about the scm-commits
mailing list