rpms/vdr-femon/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 vdr-femon.spec, 1.10, 1.11

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr-femon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18027

Modified Files:
	.cvsignore sources vdr-femon.spec 
Log Message:
Sync with 1_6-test branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Jan 2008 19:14:13 -0000	1.7
+++ .cvsignore	7 Apr 2008 19:40:15 -0000	1.8
@@ -1 +1 @@
-vdr-femon-1.1.5.tgz
+vdr-femon-1.6.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jan 2008 19:14:13 -0000	1.7
+++ sources	7 Apr 2008 19:40:15 -0000	1.8
@@ -1 +1 @@
-1477612bfd8880984481b31674f14d64  vdr-femon-1.1.5.tgz
+f726957af39cd20d6f593485ebcacd1d  vdr-femon-1.6.0.tgz


Index: vdr-femon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-femon/devel/vdr-femon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vdr-femon.spec	16 Feb 2008 10:49:19 -0000	1.10
+++ vdr-femon.spec	7 Apr 2008 19:40:15 -0000	1.11
@@ -3,8 +3,8 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        1.1.5
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        DVB frontend status monitor plugin for VDR
 
 Group:          Applications/Multimedia
@@ -14,8 +14,8 @@
 Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.4.0
-BuildRequires:  sed >= 3.95
+BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
@@ -32,22 +32,29 @@
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr STRIP=/bin/true
+make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr \
+    STRIP=/bin/true
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -55,6 +62,9 @@
 
 
 %changelog
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-1
+- 1.6.0.
+
 * Sat Feb 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.5-2
 - Rebuild.