packages: vdr/vdr.spec - rel 3; fix locale dirs blindly

arekm arekm at pld-linux.org
Sat Jan 28 17:42:49 CET 2012


Author: arekm                        Date: Sat Jan 28 16:42:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fix locale dirs blindly

---- Files affected:
packages/vdr:
   vdr.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/vdr/vdr.spec
diff -u packages/vdr/vdr.spec:1.8 packages/vdr/vdr.spec:1.9
--- packages/vdr/vdr.spec:1.8	Tue Dec 27 11:19:32 2011
+++ packages/vdr/vdr.spec	Sat Jan 28 17:42:44 2012
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Video Disk Recorder - narzędzie do nagrywania filmów
 Name:		vdr
 Version:	1.7.22
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	ftp://ftp.tvdr.de/vdr/Developer/%{name}-%{version}.tar.bz2
@@ -99,6 +99,8 @@
 
 %build
 %{__make} \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
 	CXXFLAGS="%{rpmcflags}" \
 	PREFIX="%{_prefix}" \
 	LOCDIR="%{_localedir}" \
@@ -109,6 +111,8 @@
 	REMOTE=LIRC
 
 %{__make} plugins \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
 	CXXFLAGS="%{rpmcflags} -fPIC" \
 	INCLUDES="-I../../../include -I/usr/include/ncurses"
 
@@ -125,6 +129,13 @@
 
 cp -p *.conf{,.*} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
+# hack
+for langdir in $RPM_BUILD_ROOT%{_datadir}/locale/*_*; do
+	lang=$(basename $langdir)
+	newlang=$(echo "$lang" | sed -e 's#_.*##g')
+	mv $RPM_BUILD_ROOT%{_datadir}/locale/{$lang,$newlang}
+done
+
 %find_lang %{name} --all-name
 
 %clean
@@ -138,6 +149,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf*
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/svdrpsend
+%dir %{_libdir}/vdr
 %attr(755,root,root) %{_libdir}/vdr/libvdr-dvbhddevice.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-dvbsddevice.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-hello.so.*
@@ -179,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/01/28 16:42:44  arekm
+- rel 3; fix locale dirs blindly
+
 Revision 1.8  2011/12/27 10:19:32  glen
 - don't use {} block
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vdr/vdr.spec?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list