[bluedevil/f17] include translations (copied from -rc1)

Rex Dieter rdieter at fedoraproject.org
Mon Apr 30 15:22:39 UTC 2012


commit fbb39df54f9cb2a673a5794a033b49c7c2b93bb6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 10:24:59 2012 -0500

    include translations (copied from -rc1)

 .gitignore                           |    1 +
 bluedevil-1.3-rc2-translations.patch |   10 ++++++++++
 bluedevil.spec                       |   16 ++++++++++++----
 sources                              |    1 +
 4 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f21ffa..96299e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /bluedevil-1.3-rc2.tar.bz2
+/bluedevil-po-1.3-rc1.tar.bz2
diff --git a/bluedevil-1.3-rc2-translations.patch b/bluedevil-1.3-rc2-translations.patch
new file mode 100644
index 0000000..b3138c9
--- /dev/null
+++ b/bluedevil-1.3-rc2-translations.patch
@@ -0,0 +1,10 @@
+diff -up bluedevil-1.3-rc2/CMakeLists.txt.translations bluedevil-1.3-rc2/CMakeLists.txt
+--- bluedevil-1.3-rc2/CMakeLists.txt.translations	2012-04-28 22:15:56.000000000 -0500
++++ bluedevil-1.3-rc2/CMakeLists.txt	2012-04-30 10:21:18.915869046 -0500
+@@ -9,3 +9,6 @@ find_package(SharedMimeInfo REQUIRED)
+ include_directories(${KDE4_INCLUDES} ${LibBlueDevil_INCLUDE_DIR})
+ 
+ add_subdirectory(src)
++
++include(MacroOptionalAddSubdirectory)
++macro_optional_add_subdirectory( po )
diff --git a/bluedevil.spec b/bluedevil.spec
index b21bdac..9553f81 100644
--- a/bluedevil.spec
+++ b/bluedevil.spec
@@ -3,7 +3,7 @@
 
 Name:           bluedevil
 Version:        1.3
-Release:        0.4.%{pre}%{?dist}
+Release:        0.5.%{pre}%{?dist}
 Summary:        Bluetooth stack for KDE
 
 Group:          Applications/Communications
@@ -12,6 +12,10 @@ URL:            http://www.afiestas.org/
 Source0:        http://download.kde.org/unstable/bluedevil/%{version}%{?pre:-%{pre}}/src/bluedevil-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# translations from -rc1, -rc2 includes none
+Source10:       bluedevil-po-1.3-rc1.tar.bz2
+Patch10:        bluedevil-1.3-rc2-translations.patch
+
 ## upstream patches
 
 BuildRequires:  cmake
@@ -51,7 +55,9 @@ Development files for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}} -a 10
+
+%patch10 -p1 -b .translations
 
 
 %build
@@ -67,8 +73,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-touch %{name}.lang
-%find_lang %{name} --with-kde || echo "WARNING: no translations"
+%find_lang %{name} --with-kde
 
 
 %check
@@ -127,6 +132,9 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 
 
 %changelog
+* Mon Apr 30 2012 Rex Dieter <rdieter at fedoraproject.org> 1.3-0.5.rc2
+- include translations (copied from -rc1)
+
 * Sun Apr 29 2012 Rex Dieter <rdieter at fedoraproject.org> 1.3-0.4.rc2
 - update to 1.3-rc2
 
diff --git a/sources b/sources
index 6803768..46fb6b7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 20452c528ab04c0551f3d8bfc5075c4b  bluedevil-1.3-rc2.tar.bz2
+5a2135c631f66fc65e7065f1a4262615  bluedevil-po-1.3-rc1.tar.bz2


More information about the scm-commits mailing list