[bluedevil/f14: 3/5] Revert "1.2-rc2"

[Kevin Kofler]

commit 36bfa44d664e538599f5edbdb805b4b3deb3051d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Oct 10 19:12:15 2011 +0200

    Revert "1.2-rc2"
    
    This reverts commit eb09c7e72b7da4f7e8a29cbbce3336f8a029fdbe.

 .gitignore                                  |    1 -
 bluedevil-1.2-rc1-no-serial-interface.patch |   11 +++++++++++
 bluedevil.spec                              |   11 +++++------
 sources                                     |    2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb38004..baafebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /bluedevil-1.2-rc1.tar.bz2
-/bluedevil-1.2-rc2.tar.bz2
diff --git a/bluedevil-1.2-rc1-no-serial-interface.patch b/bluedevil-1.2-rc1-no-serial-interface.patch
new file mode 100644
index 0000000..d24d5ed
--- /dev/null
+++ b/bluedevil-1.2-rc1-no-serial-interface.patch
@@ -0,0 +1,11 @@
+diff -up bluedevil-1.2-rc1/src/actionplugins/networkdun/networkdun.cpp.no-serial-interface bluedevil-1.2-rc1/src/actionplugins/networkdun/networkdun.cpp
+--- bluedevil-1.2-rc1/src/actionplugins/networkdun/networkdun.cpp.no-serial-interface	2011-07-31 03:03:55.000000000 +0200
++++ bluedevil-1.2-rc1/src/actionplugins/networkdun/networkdun.cpp	2011-08-19 14:05:23.636983574 +0200
+@@ -18,7 +18,6 @@
+  *************************************************************************************/
+ 
+ #include "networkdun.h"
+-#include "serial_interface.h"
+ #include <KLocalizedString>
+ #include <KPluginFactory>
+ #include <KNotification>
diff --git a/bluedevil.spec b/bluedevil.spec
index 1673939..f7acd43 100644
--- a/bluedevil.spec
+++ b/bluedevil.spec
@@ -1,12 +1,13 @@
 Name:           bluedevil
 Version:        1.2
-Release:        0.2.rc2%{?dist}
+Release:        0.1.rc1%{?dist}
 Summary:        Bluetooth stack for KDE
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://www.afiestas.org/
-Source0:        http://www.afiestas.org/files/bluedevil-%{version}-rc2.tar.bz2
+Source0:        http://www.afiestas.org/files/bluedevil-%{version}-rc1.tar.bz2
+Patch0:         bluedevil-1.2-rc1-no-serial-interface.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -44,8 +45,9 @@ Requires:       %{name} = %{version}-%{release}
 Development files for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q -n %{name}-%{version}-rc1
 
+%patch0 -p1 -b .no-serial-interface
 
 %build
 mkdir -p %{_target_platform}
@@ -117,9 +119,6 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 %{_includedir}/actionplugin.h
 
 %changelog
-* Mon Sep 05 2011 Jaroslav Reznik <jreznik at redhat.com> - 1.2-0.2.rc2
-- update to 1.2-rc2
-
 * Fri Aug 19 2011 Jaroslav Reznik <jreznik at redhat.com> - 1.2-0.1.rc1
 - update to 1.2-rc1
 
diff --git a/sources b/sources
index 6dcc6ab..a680344 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eea389e74d4a9c9afae4cd59fe4a6c1  bluedevil-1.2-rc2.tar.bz2
+ccb4b4de3547e7cef7159820a3d20d40  bluedevil-1.2-rc1.tar.bz2