SPECS: imieniny.spec - simplified build - detect encoding (and con...

[qboosh]

Author: qboosh                       Date: Sat Aug 25 15:21:00 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified build
- detect encoding (and convert) at runtime (R: iconv)
- release 5

---- Files affected:
SPECS:
   imieniny.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/imieniny.spec
diff -u SPECS/imieniny.spec:1.17 SPECS/imieniny.spec:1.18
--- SPECS/imieniny.spec:1.17	Thu Aug 23 17:28:09 2007
+++ SPECS/imieniny.spec	Sat Aug 25 17:20:55 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Skrypt wypisujący aktualnych solenizantów
 Name:		imieniny
 Version:	1.1.5
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/System
 Source0:	http://infoludek.com.pl/~slawek/%{name}-%{version}.tar.gz
@@ -11,7 +11,8 @@
 Source1:	%{name}.sh
 URL:		http://infoludek.com.pl/~slawek/imieniny.html
 BuildRequires:	iconv
-Requires:	sh-utils
+Requires:	coreutils
+Requires:	iconv
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,22 +26,18 @@
 %setup -q -c
 
 %build
-mkdir pl_PL{,.UTF-8}
-cp [0-9][0-9].txt pl_PL
+mkdir pl_PL.UTF-8
 for file in [0-9][0-9].txt; do
-	iconv -f latin2 -t utf-8 $file > pl_PL.UTF-8/$file.utf8
-	mv pl_PL.UTF-8/$file.utf8 pl_PL.UTF-8/$file
+	iconv -f latin2 -t utf-8 $file > pl_PL.UTF-8/$file
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/pl_PL{,.UTF-8}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/pl_PL.UTF-8}
 
-install pl_PL/*		$RPM_BUILD_ROOT%{_datadir}/%{name}/pl_PL
-install pl_PL.UTF-8/*	$RPM_BUILD_ROOT%{_datadir}/%{name}/pl_PL.UTF-8
 install	%{SOURCE1}	$RPM_BUILD_ROOT%{_bindir}/%{name}
-
-# For Th we use UTF-8 by default:
+install pl_PL.UTF-8/*	$RPM_BUILD_ROOT%{_datadir}/%{name}/pl_PL.UTF-8
+ln -sf pl_PL.UTF-8	$RPM_BUILD_ROOT%{_datadir}/%{name}/pl_PL
 ln -sf pl_PL.UTF-8	$RPM_BUILD_ROOT%{_datadir}/%{name}/pl
 
 %clean
@@ -50,7 +47,7 @@
 %defattr(644,root,root,755)
 %doc czytajto.txt
 %attr(755,root,root) %{_bindir}/%{name}
-%dir	%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
 %lang(pl) %{_datadir}/%{name}/pl_PL.UTF-8
 %lang(pl) %{_datadir}/%{name}/pl_PL
 %lang(pl) %{_datadir}/%{name}/pl
@@ -61,6 +58,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/08/25 15:20:55  qboosh
+- simplified build
+- detect encoding (and convert) at runtime (R: iconv)
+- release 5
+
 Revision 1.17  2007/08/23 15:28:09  blues
 - rel. 4 - support pl_PL.UTF-8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/imieniny.spec?r1=1.17&r2=1.18&f=u