From 6d179cced4905b127964b8a9f6f52e3bf9581a1c3ef5ccd85ae8e1d6267ac01f Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 8 Mar 2013 12:25:15 +0000
Subject: [PATCH] Accepting request 157679 from Mono:Factory

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/157679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ndesk-dbus?expand=0&rev=14
---
 ndesk-dbus.changes |  8 ++++++++
 ndesk-dbus.spec    | 49 ++++++++++++----------------------------------
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/ndesk-dbus.changes b/ndesk-dbus.changes
index 04a2f94..62120e7 100644
--- a/ndesk-dbus.changes
+++ b/ndesk-dbus.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Jan 12 01:56:57 UTC 2013 - jengelh@inai.de
+
+- Use standard %configure and enable parallel build
+- Directly place .pc file in its final location
+- Simplify BuildRequires list, kill %clean section and unused
+  changelog (it's in .changes, after all)
+
 -------------------------------------------------------------------
 Tue Feb  5 00:44:45 CET 2008 - wberrier@suse.de
 
diff --git a/ndesk-dbus.spec b/ndesk-dbus.spec
index cccd8de..06da45a 100644
--- a/ndesk-dbus.spec
+++ b/ndesk-dbus.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package ndesk-dbus (Version 0.6.0)
+# spec file for package ndesk-dbus
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,38 +16,28 @@
 #
 
 
-
 Name:           ndesk-dbus
 Version:        0.6.0
-Release:        63
+Release:        0
 %if 0%{?fedora_version}  
    %define env_options export MONO_SHARED_DIR=/tmp  
 %endif  
 %if 0%{?sles_version} == 9
    %define exp_env export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%{_lib}/pkgconfig
 %endif
-%if 0%{?fedora_version}
-   %define build_req pkgconfig mono-devel
-%else
-   %if 0%{?sles_version} == 9
-      %define build_req pkgconfig mono-devel glib2-devel
-   %else
-      %if 0%{?suse_version} == 1000
-         %define build_req pkgconfig mono-devel glib2-devel
-      %else
-         %define build_req pkg-config mono-devel
-      %endif
-   %endif
-%endif
+Summary:        Managed C# implementation of D-Bus
 License:        MIT
 Group:          Development/Libraries/Other
-Summary:        Managed C# implementation of D-Bus
 Url:            http://www.ndesk.org/DBusSharp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 Provides:       ndesk-dbus-devel < %{version}
 Obsoletes:      ndesk-dbus-devel < %{version}
-BuildRequires:  %{?build_req}
+BuildRequires:  mono-devel
+BuildRequires:  pkgconfig
+%if 0%{?sles_version} == 9 || 0%{?suse_version} == 1000
+BuildRequires:  glib2-devel
+%endif
 BuildArch:      noarch
 
 %description
@@ -66,18 +56,13 @@ Version 0.11 and study of the wire protocol of existing tools.
 %build
 %{?exp_env}
 %{?env_options}
-./configure --prefix=/usr
-make
+%configure --libdir="%_prefix/lib"
+make %{?_smp_mflags}
 
 %install
 %{?env_options}
-make DESTDIR=${RPM_BUILD_ROOT} install
-# For noarch
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pkgconfig
-mv ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/ndesk-dbus-1.0.pc ${RPM_BUILD_ROOT}%{_datadir}/pkgconfig/
-
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+# This is all noarch, so the .pc file can go to %%_datadir.
+make install DESTDIR="%buildroot" pkgconfigdir="%_datadir/pkgconfig"
 
 %files
 %defattr(-,root,root)
@@ -93,11 +78,3 @@ mv ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/ndesk-dbus-1.0.pc ${RPM_BUILD_ROOT}%{_dat
 %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq'
 
 %changelog
-* Tue Feb 05 2008 wberrier@suse.de
-- Update ndesk-dbus from mchristensen's build service project
- -move .pc file to usr/share and make noarch
- -clean up filelist
-* Fri Nov 09 2007 mchristensen@novell.com
-- initial packaging (update to 0.6.0 in build service)
-* Thu May 31 2007 mauro@novell.com
-- Adding this pacakge to factory