[bluedevil] 2.0.0-0.10.rc1

Rex Dieter rdieter at fedoraproject.org
Sat Dec 21 12:52:31 UTC 2013


commit 0372c8ed01f666d4af8f49741bc1dde4b085923f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 21 06:52:20 2013 -0600

    2.0.0-0.10.rc1
    
    - bluedevil-2.0-rc1
    - fake 2.0.0 version (instead of 2.0) to avoid epoch
    - Obsoletes: bluedevil-devel

 .gitignore              |    5 +--
 bluedevil-r114433.patch |   87 -----------------------------------------------
 bluedevil.spec          |   43 +++++++---------------
 sources                 |    2 +-
 4 files changed, 16 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66d28b2..dad574b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/bluedevil-2.0.0-20130907git.tar.bz2
-/bluedevil-2.0.0-20131015git.tar.bz2
-/bluedevil-2.0.0-20131128.tar.xz
-/bluedevil-2.0.0-20131219.tar.xz
+/bluedevil-2.0-rc1.tar.xz
diff --git a/bluedevil.spec b/bluedevil.spec
index 268e314..1482709 100644
--- a/bluedevil.spec
+++ b/bluedevil.spec
@@ -1,23 +1,22 @@
 
-%define snap 20131219
-%define libbluedevil_ver 2.0-0.4
+#define snap 20131219
+%define libbluedevil_ver 2.0-0.5
+%define pre rc1
+%define ver 2.0
 
 Name:           bluedevil
 Summary:        Bluetooth stack for KDE
-Version:        2.0.0
-Release:        0.8.%{snap}%{?dist}
+Version:        %{ver}.0
+Release:        0.10.%{pre}%{?dist}
 
 License:        GPLv2+
 URL:            https://projects.kde.org/projects/extragear/base/bluedevil
 %if 0%{?snap:1}
 Source0:        bluedevil-%{version}-%{snap}.tar.xz
 %else
-Source0:        http://download.kde.org/%{?pre:un}stable/bluedevil/%{version}%{?pre:-%{pre}}/src/bluedevil-%{version}%{?pre:-%{pre}}.tar.bz2
+Source0:        http://download.kde.org/%{?pre:un}stable/bluedevil/bluedevil-%{ver}%{?pre:-%{pre}}.tar.xz
 %endif
 
-# https://git.reviewboard.kde.org/r/114433/
-Patch1: bluedevil-r114433.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -26,6 +25,7 @@ BuildRequires:  libbluedevil-devel%{?libbluedevil_ver: >= %{libbluedevil_ver}}
 Provides:       dbus-bluez-pin-helper
 
 Obsoletes:      kbluetooth < 0.4.2-3
+Obsoletes:      bluedevil-devel < 2.0.0-0.10
 
 Requires:       kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 Requires:       libbluedevil%{?_isa}%{?libbluedevil_ver: >= %{libbluedevil_ver}}
@@ -34,18 +34,9 @@ Requires:       pulseaudio-module-bluetooth
 %description
 BlueDevil is the bluetooth stack for KDE.
 
-%package        devel
-Summary:        Development files for %{name}
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-%description    devel
-%{summary}.
-
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
-
-%patch1 -p1 -b .r114433
+%setup -q -n %{name}-%{ver}%{?pre:-%{pre}}
 
 
 %build
@@ -84,31 +75,25 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 %doc README
 %{_kde4_appsdir}/bluedevil/
 %{_kde4_appsdir}/bluedevilwizard/
-
-%{_kde4_bindir}/bluedevil-audio
-%{_kde4_bindir}/bluedevil-input
 %{_kde4_bindir}/bluedevil-monolithic
-%{_kde4_bindir}/bluedevil-network-dun
-%{_kde4_bindir}/bluedevil-network-panu
 %{_kde4_bindir}/bluedevil-sendfile
 %{_kde4_bindir}/bluedevil-wizard
 %{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/actionplugin.desktop
 %{_kde4_datadir}/mime/packages/bluedevil-mime.xml
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/libbluedevilaction.so
 %{_kde4_libexecdir}/bluedevil-authorize
 %{_kde4_libexecdir}/bluedevil-confirmmodechange
 %{_kde4_libexecdir}/bluedevil-requestconfirmation
 %{_kde4_libexecdir}/bluedevil-requestpin
 
-%files devel
-%doc HACKING
-%{_kde4_includedir}/bluedevil/
-
 
 %changelog
+* Sat Dec 21 2013 Rex Dieter <rdieter at fedoraproject.org> - 2.0.0-0.10.rc1
+- bluedevil-2.0-rc1
+- fake 2.0.0 version (instead of 2.0) to avoid epoch 
+- Obsoletes: bluedevil-devel
+
 * Thu Dec 19 2013 Rex Dieter <rdieter at fedoraproject.org> 2.0.0-0.8.20131219
 - 20131219 snapshot
 
diff --git a/sources b/sources
index e180f61..819c188 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5480317ccef90222e4e9eeef9005536c  bluedevil-2.0.0-20131219.tar.xz
+7137a6dae1e860c91ea266546e6bfd39  bluedevil-2.0-rc1.tar.xz


More information about the scm-commits mailing list