This commit is contained in:
parent
68744d578d
commit
53b4eb2920
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 25 17:07:58 CEST 2007 - thoenig@suse.de
|
||||
|
||||
- move D-Bus to / (b.n.c #285472)
|
||||
- remove static libraries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 20 13:55:56 CEST 2007 - dmueller@suse.de
|
||||
|
||||
|
@ -20,7 +20,7 @@ Summary: X11-requiring add-ons for D-Bus
|
||||
# COMMON1-BEGIN
|
||||
BuildRequires: doxygen libexpat-devel libzio pkgconfig
|
||||
Version: 1.0.2
|
||||
Release: 43
|
||||
Release: 46
|
||||
Autoreqprov: on
|
||||
Source0: dbus-%{version}.tar.gz
|
||||
Source1: rc.boot.dbus
|
||||
@ -70,15 +70,14 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
|
||||
export CFLAGS="$CFLAGS -fstack-protector"
|
||||
export CXXFLAGS="$CXXFLAGS -fstack-protector"
|
||||
%endif
|
||||
# doesn't work yet because libexpat is in /usr
|
||||
# --bindir=/bin
|
||||
./configure \
|
||||
--prefix=%{_prefix} \
|
||||
--bindir=/bin \
|
||||
--exec_prefix=%{_exec_prefix} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
--datadir=%{_datadir} \
|
||||
--localstatedir=%{_localstatedir} \
|
||||
--libdir=%{_libdir} \
|
||||
--libdir=/%{_lib} \
|
||||
--mandir=%{_mandir} \
|
||||
--with-init-scripts=suse \
|
||||
--enable-dnotify \
|
||||
@ -108,6 +107,9 @@ rm -rf $tdir
|
||||
%{_mandir}/man1/dbus-launch.1*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 25 2007 - thoenig@suse.de
|
||||
- move D-Bus to / (b.n.c #285472)
|
||||
- remove static libraries
|
||||
* Fri Jul 20 2007 - dmueller@suse.de
|
||||
- build against libexpat (#285472)
|
||||
* Tue Jun 19 2007 - thoenig@suse.de
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 25 17:07:58 CEST 2007 - thoenig@suse.de
|
||||
|
||||
- move D-Bus to / (b.n.c #285472)
|
||||
- remove static libraries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 20 13:55:56 CEST 2007 - dmueller@suse.de
|
||||
|
||||
|
38
dbus-1.spec
38
dbus-1.spec
@ -18,7 +18,7 @@ Summary: D-Bus Message Bus System
|
||||
# COMMON1-BEGIN
|
||||
BuildRequires: doxygen libexpat-devel libzio pkgconfig
|
||||
Version: 1.0.2
|
||||
Release: 38
|
||||
Release: 41
|
||||
Autoreqprov: on
|
||||
Source0: dbus-%{version}.tar.gz
|
||||
Source1: rc.boot.dbus
|
||||
@ -137,15 +137,14 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
|
||||
export CFLAGS="$CFLAGS -fstack-protector"
|
||||
export CXXFLAGS="$CXXFLAGS -fstack-protector"
|
||||
%endif
|
||||
# doesn't work yet because libexpat is in /usr
|
||||
# --bindir=/bin
|
||||
./configure \
|
||||
--prefix=%{_prefix} \
|
||||
--bindir=/bin \
|
||||
--exec_prefix=%{_exec_prefix} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
--datadir=%{_datadir} \
|
||||
--localstatedir=%{_localstatedir} \
|
||||
--libdir=%{_libdir} \
|
||||
--libdir=/%{_lib} \
|
||||
--mandir=%{_mandir} \
|
||||
--with-init-scripts=suse \
|
||||
--enable-dnotify \
|
||||
@ -166,7 +165,14 @@ install -d %{buildroot}/%{_localstatedir}/run/dbus
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %SOURCE2 \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
|
||||
rm -f %{buildroot}/%{_bindir}/dbus-launch
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
|
||||
rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
|
||||
mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/
|
||||
rm -f %{buildroot}/%{_lib}/*.a
|
||||
rm -f %{buildroot}/%{_lib}/*.la
|
||||
rm -f %{buildroot}/bin/dbus-launch
|
||||
rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1*
|
||||
|
||||
%clean
|
||||
@ -197,18 +203,18 @@ mkdir -p %{_localstatedir}/lib/dbus
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%dir %{_libdir}/dbus-1.0
|
||||
%dir /%{_lib}/dbus-1.0
|
||||
%dir %{_datadir}/dbus-1
|
||||
%dir %{_datadir}/dbus-1/services
|
||||
%doc AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README
|
||||
%{_sysconfdir}/dbus-1
|
||||
%{_sysconfdir}/init.d/dbus
|
||||
%{_bindir}/dbus-cleanup-sockets
|
||||
%{_bindir}/dbus-daemon
|
||||
%{_bindir}/dbus-monitor
|
||||
%{_bindir}/dbus-send
|
||||
%{_bindir}/dbus-uuidgen
|
||||
%{_libdir}/*dbus-1.so.*
|
||||
/bin/dbus-cleanup-sockets
|
||||
/bin/dbus-daemon
|
||||
/bin/dbus-monitor
|
||||
/bin/dbus-send
|
||||
/bin/dbus-uuidgen
|
||||
/%{_lib}/*dbus-1.so.*
|
||||
%{_mandir}/man1/dbus-cleanup-sockets.1.*
|
||||
%{_mandir}/man1/dbus-daemon.1.*
|
||||
%{_mandir}/man1/dbus-monitor.1.*
|
||||
@ -220,10 +226,7 @@ mkdir -p %{_localstatedir}/lib/dbus
|
||||
%files -n dbus-1-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/*
|
||||
# dbus-1 devel files
|
||||
%{_libdir}/*dbus-1.a
|
||||
%{_libdir}/*dbus-1.la
|
||||
%{_libdir}/*dbus-1.so
|
||||
/%{_lib}/*dbus-1.so
|
||||
%{_libdir}/dbus-1.0/include
|
||||
%{_libdir}/pkgconfig/dbus-1.pc
|
||||
|
||||
@ -234,6 +237,9 @@ mkdir -p %{_localstatedir}/lib/dbus
|
||||
%{_datadir}/susehelp
|
||||
|
||||
%changelog
|
||||
* Wed Jul 25 2007 - thoenig@suse.de
|
||||
- move D-Bus to / (b.n.c #285472)
|
||||
- remove static libraries
|
||||
* Fri Jul 20 2007 - dmueller@suse.de
|
||||
- build against libexpat (#285472)
|
||||
* Tue Jun 19 2007 - thoenig@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user