From d13f957518a4451d5b3e3131363473a7bc1a9644 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Tue, 19 Apr 2016 13:00:12 +0200 Subject: [PATCH] packaging: Remove dbus-x11 flavor dbus-x11 is not used on tizen.org in any of available profiles. Change-Id: I94205fbdb526a96202bd2f2165e6a5bcf2c2a080 --- packaging/dbus-x11.manifest | 5 -- packaging/dbus-x11.spec | 119 -------------------------------------------- packaging/dbus-x11.spec.in | 34 ------------- 3 files changed, 158 deletions(-) delete mode 100644 packaging/dbus-x11.manifest delete mode 100644 packaging/dbus-x11.spec delete mode 100644 packaging/dbus-x11.spec.in diff --git a/packaging/dbus-x11.manifest b/packaging/dbus-x11.manifest deleted file mode 100644 index 017d22d..0000000 --- a/packaging/dbus-x11.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/dbus-x11.spec b/packaging/dbus-x11.spec deleted file mode 100644 index 28f0710..0000000 --- a/packaging/dbus-x11.spec +++ /dev/null @@ -1,119 +0,0 @@ -%bcond_with x -%bcond_with kdbus -%bcond_with dbuspolicy - -Name: dbus-x11 -%define _name dbus -BuildRequires: pkgconfig(x11) -Url: http://dbus.freedesktop.org/ -License: GPL-2.0+ or AFL-2.1 -Group: Base/IPC -Summary: D-Bus Message Bus System -# COMMON1-BEGIN -# COMMON1-BEGIN - -# We can't enable this right now, because it will create a build cycle between -# dbus-1 and systemd. Fun! -%define with_systemd 1 - -BuildRequires: doxygen -BuildRequires: expat-devel -BuildRequires: libtool -BuildRequires: libxslt-tools -BuildRequires: libzio -BuildRequires: pkg-config -BuildRequires: xmlto -%if %{with_systemd} -BuildRequires: pkgconfig(libsystemd-daemon) -BuildRequires: pkgconfig(libsystemd-login) -%endif -Version: 1.10.6 -Release: 0 -Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz -Source1: rc.boot.dbus -Source3: dbus_at_console.ck -Source4: baselibs.conf -Source5: dbus-user.service -Source6: dbus-user.socket -Source1001: dbus-x11.manifest -BuildRequires: libcap-ng-devel -BuildRequires: pkgconfig(libsmack) -# Enable support for libdbuspolicy (only for kdbus transport) -%if %{with kdbus} -%if %{with dbuspolicy} -BuildRequires: pkgconfig(libdbuspolicy1) -BuildRequires: pkgconfig(cynara-client) -%endif -%endif -# COMMON1-END -# COMMON1-END - -%if !%{with x} -ExclusiveArch: -%endif - -%description -D-Bus contains some tools that require Xlib to be installed, those are -in this separate package so server systems need not install X. - -%prep -# COMMON2-BEGIN -# COMMON2-BEGIN -%setup -n dbus-%{version} -q -cp %{SOURCE1001} . - -%build -autoreconf -fi -# We use -fpie/-pie for the whole build; this is the recommended way to harden -# the build upstream, see discussion in fdo#46570 -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie" -export LDFLAGS="-pie" -export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" -export CFLAGS="$CFLAGS -fstack-protector" -export CXXFLAGS="$CXXFLAGS -fstack-protector" -export V=1 -%configure \ - --disable-static \ - --with-pic \ - --with-dbus-user=dbus \ - --libexecdir=%{_libdir}/%{name} \ - --libdir=%{_libdir} \ - --with-init-scripts=suse \ - --enable-inotify \ - --enable-doxygen-docs \ -%if %{with_systemd} - --enable-systemd \ -%endif -%if %{with kdbus} - --enable-kdbus-transport \ -%if %{with dbuspolicy} - --enable-libdbuspolicy \ -%endif -%endif - --with-console-auth-dir=/var/run/dbus/at_console/ \ - --with-systemdsystemunitdir=%{_unitdir} \ - --enable-smack - -make %{?_smp_mflags} - -%install -# COMMON2-END -# COMMON2-END -tdir=$(mktemp -d) -make DESTDIR=$tdir install -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/%{_mandir}/man1 -mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir} -mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 -rm -rf $tdir - -%clean -%{__rm} -rf %{buildroot} - -%files -%manifest %{name}.manifest -%defattr(-,root,root) -%{_bindir}/dbus-launch -%{_mandir}/man1/dbus-launch.1* - -%changelog diff --git a/packaging/dbus-x11.spec.in b/packaging/dbus-x11.spec.in deleted file mode 100644 index f40e344..0000000 --- a/packaging/dbus-x11.spec.in +++ /dev/null @@ -1,34 +0,0 @@ -Name: dbus-x11 -%define _name dbus -BuildRequires: pkgconfig(x11) -Url: http://dbus.freedesktop.org/ -License: GPL-2.0+ or AFL-2.1 -Group: Base/IPC -Summary: D-Bus Message Bus System -# COMMON1-BEGIN -# COMMON1-END - -%description -D-Bus contains some tools that require Xlib to be installed, those are -in this separate package so server systems need not install X. - -%prep -# COMMON2-BEGIN -# COMMON2-END -tdir=$(mktemp -d) -make DESTDIR=$tdir install -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/%{_mandir}/man1 -mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir} -mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 -rm -rf $tdir - -%clean -%{__rm} -rf %{buildroot} - -%files -%defattr(-,root,root) -%{_bindir}/dbus-launch -%{_mandir}/man1/dbus-launch.1* - -%changelog -- 2.7.4