Author: rathann
Update of /cvs/pkgs/rpms/ekg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17490
Modified Files:
ekg.spec
Added Files:
ekg-unicode
Log Message:
- use luit wrapper to work around lack of unicode support (bug #210745)
- fix line endings and docs encoding in prep instead of install section
--- NEW FILE ekg-unicode ---
#!/bin/sh
exec luit -encoding 'ISO 8859-2' ekg.wrapped "$@"
Index: ekg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg/devel/ekg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ekg.spec 6 Dec 2007 16:16:21 -0000 1.6
+++ ekg.spec 1 Jan 2008 17:31:23 -0000 1.7
@@ -1,6 +1,6 @@
Name: ekg
Version: 1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A client compatible with Gadu-Gadu
Summary(de): Ein Cliente kompatibel mit Gadu-Gadu
Summary(es): Un cliente compatible con Gadu-Gadu
@@ -10,6 +10,7 @@
Group: Applications/Internet
Source0:
http://ekg.chmurka.net/%{name}-%{version}.tar.gz
Source1: %{name}.conf
+Source2: ekg-unicode
Patch0: %{name}-rpm.patch
Patch1: %{name}-external-libgadu.patch
URL:
http://ekg.chmurka.net/
@@ -24,6 +25,7 @@
BuildRequires: perl
BuildRequires: python-devel
BuildRequires: zlib-devel
+Requires: %{_bindir}/luit
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -75,6 +77,18 @@
%setup -q
%patch0 -p1 -b .r
%patch1 -p1 -b .libgadu
+# fix line endings and encoding
+tr -d '\r' < contrib/ekl2.pl > contrib/ekl2.pl.unix ; mv
contrib/ekl2.pl.unix contrib/ekl2.pl
+for file in \
+ contrib/ekl2* \
+ docs/api/functions.txt \
+ docs/*.txt \
+ docs/FAQ docs/IDEAS-2.0 docs/README docs/TODO docs/ULOTKA \
+ docs/*.man.pl \
+ ChangeLog* \
+; do
+ iconv -f iso8859-2 -t utf8 -o $file.utf $file && mv $file.utf $file
+done
%build
rm -f missing
@@ -99,30 +113,19 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}
-# fix line endings and encoding befor make install
-tr -d '\r' < contrib/ekl2.pl > contrib/ekl2.pl.unix ; mv
contrib/ekl2.pl.unix contrib/ekl2.pl
-
-for file in \
- contrib/ekl2* \
- docs/api/functions.txt \
- docs/*.txt \
- docs/FAQ docs/IDEAS-2.0 docs/README docs/TODO docs/ULOTKA \
- docs/*.man.pl \
- ChangeLog* \
-; do
-iconv -f iso8859-2 -t utf8 -o $file.utf $file ; mv $file.utf $file
-done
-
%{__make} install install-ekl2 \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
# For libgadu-devel
rm -f examples/Makefile examples/Makefile.in examples/.cvsignore
rm -rf examples/CVS
+mv $RPM_BUILD_ROOT%{_bindir}/ekg $RPM_BUILD_ROOT%{_bindir}/ekg.wrapped
+install -pm755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ekg
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -140,6 +143,10 @@
%lang(pl) %{_mandir}/pl/man1/*
%changelog
+* Tue Jan 01 2008 Dominik Mierzejewski <rpm(a)greysector.net> 1.7-4
+- use luit wrapper to work around lack of unicode support (bug #210745)
+- fix line endings and docs encoding in prep instead of install section
+
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.7-3
- Rebuild for deps