rpms/kpilot/devel .cvsignore, 1.2, 1.3 kpilot.spec, 1.2, 1.3 sources, 1.2, 1.3

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kpilot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29526/devel

Modified Files:
	.cvsignore kpilot.spec sources 
Log Message:
* Fri Jan 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-3
- Ship translations collected from branches/stable/l10n-kde4
- BR gettext
- Conflicts: kde-l10n < 4.3.90-3 (F12-)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Dec 2009 07:57:20 -0000	1.2
+++ .cvsignore	15 Jan 2010 03:08:34 -0000	1.3
@@ -1 +1,2 @@
 kdepim-4.3.4.tar.bz2
+kpilot-translations-20100115.tar.bz2


Index: kpilot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/kpilot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kpilot.spec	22 Dec 2009 08:06:34 -0000	1.2
+++ kpilot.spec	15 Jan 2010 03:08:34 -0000	1.3
@@ -1,7 +1,7 @@
 Name:    kpilot
 Summary: Sync PIM data with PalmOS devices
 Version: 5.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # no pilot-link on S/390
 ExcludeArch: s390 s390x
@@ -10,6 +10,10 @@ License: GPLv2+
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.3.4/src/kdepim-4.3.4.tar.bz2
+# translations collected from:
+# http://websvn.kde.org/branches/stable/l10n-kde4/*/messages/kdepim
+# http://websvn.kde.org/branches/stable/l10n-kde4/*/docs/kdepim
+Source1: kpilot-translations-20100115.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kdelibs4-devel >= 4.3.4
@@ -19,11 +23,13 @@ BuildRequires: boost-devel
 BuildRequires: pilot-link-devel >= 0.12
 BuildRequires: qca2-devel
 BuildRequires: desktop-file-utils
+BuildRequires: gettext
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?fedora} < 13
 Conflicts: kdepim < 6:4.3.80
+Conflicts: kde-l10n < 4.3.90-3
 %endif
 
 %description
@@ -40,8 +46,9 @@ Group:   System Environment/Libraries
 
 
 %prep
-%setup -q -n kdepim-4.3.4
+%setup -q -n kdepim-4.3.4 -a 1
 echo 'add_subdirectory(../doc/kpilot doc)' >>kpilot/CMakeLists.txt
+echo 'add_subdirectory(../kpilot-translations-20100115 l10n)' >>kpilot/CMakeLists.txt
 
 
 %build
@@ -73,6 +80,8 @@ popd
 rm -rf %{buildroot}%{_kde4_includedir}/kpilot/
 rm -f %{buildroot}%{_kde4_libdir}/libkpilot.so
 
+%find_lang %{name} --with-kde
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -103,7 +112,7 @@ fi
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc kpilot/COPYING
 %doc kpilot/README kpilot/AUTHORS kpilot/ChangeLog kpilot/NEWS kpilot/TODO
@@ -127,6 +136,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-3
+- Ship translations collected from branches/stable/l10n-kde4
+- BR gettext
+- Conflicts: kde-l10n < 4.3.90-3 (F12-)
+
 * Tue Dec 22 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.3.0-2
 - shorten Summary and add linebreak in %%description
 - Conflicts with old versions of kdepim (F12-)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpilot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Dec 2009 07:57:21 -0000	1.2
+++ sources	15 Jan 2010 03:08:34 -0000	1.3
@@ -1 +1,2 @@
 a4f32a268802be8eb852d1de00cbd2f6  kdepim-4.3.4.tar.bz2
+ff905978461753827981542814c827ae  kpilot-translations-20100115.tar.bz2