SPECS: dbus.spec - --as-needed support, dropped X11 subpackage (se...

[freetz]

Author: freetz                       Date: Tue Jul 11 16:41:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- --as-needed support, dropped X11 subpackage (session can be started
  even without questionable deps)

---- Files affected:
SPECS:
   dbus.spec (1.130 -> 1.131) 

---- Diffs:

================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.130 SPECS/dbus.spec:1.131
--- SPECS/dbus.spec:1.130	Mon Jun 12 20:41:09 2006
+++ SPECS/dbus.spec	Tue Jul 11 18:41:20 2006
@@ -31,7 +31,7 @@
 Summary(pl):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
 Version:	0.62
-Release:	1
+Release:	2
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -39,7 +39,6 @@
 Source1:	messagebus.init
 Source2:	%{name}-daemon-1-profile.d-sh
 Source3:	%{name}-sysconfig
-Source4:	%{name}-xinitrc.sh
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-mint.patch
@@ -90,6 +89,7 @@
 Requires:	rc-scripts
 Provides:	group(messagebus)
 Provides:	user(messagebus)
+Obsoletes:	dbus-X11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -205,19 +205,6 @@
 %description gtk -l pl
 Oparte na GTK+ graficzne narzędzie do D-BUS.
 
-%package X11
-Summary:	X11 D-BUS utilities
-Summary(pl):	Narzędzia X11 D-BUSa
-Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
-Requires:	xinitrc
-
-%description X11
-X11 D-BUS utilities.
-
-%description X11 -l pl
-Narzędzia X11 D-BUSa.
-
 %package -n dotnet-%{name}-sharp
 Summary:	.NET library for using D-BUS
 Summary(pl):	Biblioteka .NET do używania D-BUS
@@ -356,6 +343,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
 	GCJFLAGS="%{rpmcflags}" \
 	QTDIR=/usr \
@@ -386,7 +374,6 @@
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT/etc/profile.d
 install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
 install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/services
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
 
@@ -398,7 +385,6 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/dbus
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/dbus.sh
 
 %if %{with python}
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/*.{py,la,a}
@@ -510,10 +496,6 @@
 %attr(755,root,root) %{_bindir}/dbus-viewer
 %endif
 
-%files X11
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/dbus.sh
-
 %if %{with dotnet}
 %files -n dotnet-%{name}-sharp
 %defattr(644,root,root,755)
@@ -573,6 +555,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2006/07/11 16:41:20  freetz
+- --as-needed support, dropped X11 subpackage (session can be started
+  even without questionable deps)
+
 Revision 1.130  2006/06/12 18:41:09  freetz
 - 0.62
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.130&r2=1.131&f=u