/[packages]/updates/3/dbus/current/SPECS/dbus.spec
ViewVC logotype

Diff of /updates/3/dbus/current/SPECS/dbus.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 234333 by blino, Mon Apr 30 00:23:06 2012 UTC revision 260692 by fwang, Fri Jun 15 03:46:09 2012 UTC
# Line 6  Line 6 
6    
7  %define lib_major 3  %define lib_major 3
8  %define lib_api 1  %define lib_api 1
9  %define lib_name %mklibname dbus- %{lib_api} %{lib_major}  %define lib_name %mklibname dbus %{lib_api} %{lib_major}
10  %define develname %mklibname -d dbus- %lib_api  %define develname %mklibname -d dbus
11    
12  %define enable_test 0  %define enable_test 0
13  %define enable_verbose 0  %define enable_verbose 0
# Line 16  Line 16 
16    
17  Summary: D-Bus message bus  Summary: D-Bus message bus
18  Name: dbus  Name: dbus
19  Version: 1.4.16  Version: 1.6.0
20  Release: %mkrel 5  Release: %mkrel 1
21  URL: http://www.freedesktop.org/Software/dbus  URL: http://www.freedesktop.org/Software/dbus
22  Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz  Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
23  # (fc) 0.20-1mdk fix start/stop order (fd.o bug #11491), starts after network  # (fc) 0.20-1mdk fix start/stop order (fd.o bug #11491), starts after network
24  Patch0: dbus-initscript.patch  Patch0: dbus-initscript.patch
 # (fc) 1.0.2-5mdv disable fatal warnings on check (fd.o bug #13270)  
 Patch3: dbus-1.0.2-disable_fatal_warning_on_check.patch  
 # (bor) synchronize dbus.service with dbus.target so dependencies work  
 Patch7:         dbus-1.4.4-dbus.service-before-dbus.target.patch  
   
25  License: GPLv2+ or AFL  License: GPLv2+ or AFL
26  Group: System/Servers  Group: System/Servers
27  BuildRequires: libx11-devel  BuildRequires: libx11-devel
# Line 37  BuildRequires: doxygen Line 32  BuildRequires: doxygen
32  %endif  %endif
33  BuildRequires: libtool  BuildRequires: libtool
34  BuildRequires: libcap-ng-devel  BuildRequires: libcap-ng-devel
35  BuildRequires: pkgconfig(glib-2.0) >= 2.22  BuildRequires: pkgconfig(gio-2.0) >= 2.24
36  BuildRequires: pkgconfig(gio-2.0) >= 2.22  BuildRequires: pkgconfig(glib-2.0) >= 2.24
37  BuildRequires: pkgconfig(systemd)  BuildRequires: pkgconfig(libsystemd-daemon) >= 32
38    BuildRequires: pkgconfig(libsystemd-login) >= 32
39  Requires(post):  rpm-helper >= 0.24.8-1  Requires(post):  rpm-helper >= 0.24.8-1
40  Requires(preun): rpm-helper >= 0.24.8-1  Requires(preun): rpm-helper >= 0.24.8-1
41  Requires(post): chkconfig >= 1.3.37-3  Requires(post): chkconfig >= 1.3.37-3
# Line 55  per-user-login-session messaging facilit Line 51  per-user-login-session messaging facilit
51  Summary: Shared library for using D-Bus  Summary: Shared library for using D-Bus
52  Group: System/Libraries  Group: System/Libraries
53  Requires: dbus >= %{version}  Requires: dbus >= %{version}
54    Obsoletes: %{_lib}dbus-1_3 < 1.6.0
55    
56  %description -n %{lib_name}  %description -n %{lib_name}
57  D-Bus shared library.  D-Bus shared library.
# Line 68  Provides: lib%{name}-1-devel = %{version Line 65  Provides: lib%{name}-1-devel = %{version
65  Provides: lib%{name}-devel = %{version}-%{release}  Provides: lib%{name}-devel = %{version}-%{release}
66  Provides: %{name}-devel = %{version}-%{release}  Provides: %{name}-devel = %{version}-%{release}
67  Conflicts: %{_lib}dbus-1_0-devel  Conflicts: %{_lib}dbus-1_0-devel
68  Obsoletes: %mklibname -d dbus- 1 3  Obsoletes: %{mklibname -d dbus- 1 3} < 1.6.0
69    Obsoletes: %{_lib}dbus-1-devel < 1.6.0
70    
71  %description -n %develname  %description -n %develname
72  Headers and static libraries for D-Bus.  Headers and static libraries for D-Bus.
# Line 83  Summary: Developer documentation for D-B Line 81  Summary: Developer documentation for D-B
81  Group: Books/Computer books  Group: Books/Computer books
82  Requires: dbus = %{version}  Requires: dbus = %{version}
83  Suggests: devhelp  Suggests: devhelp
84  Conflicts: %develname < 1.2.20  BuildArch: noarch
85    Conflicts: libdbus-1-devel < 1.2.20
86    Conflicts: lib64dbus-1-devel < 1.2.20
87    
88  %description doc  %description doc
89  This package contains developer documentation for D-Bus along with  This package contains developer documentation for D-Bus along with
# Line 96  in this separate package so server syste Line 96  in this separate package so server syste
96  %prep  %prep
97  %setup -q  %setup -q
98  %patch0 -p1 -b .initscript  %patch0 -p1 -b .initscript
 #only disable in cooker to detect buggy programs  
 #patch3 -p1 -b .disable_fatal_warning_on_check  
 %patch7 -p1 -b .after_dbus_target  
99    
100  %build  %build
101    
# Line 109  COMMON_ARGS="--disable-static --disable- Line 106  COMMON_ARGS="--disable-static --disable-
106    
107  #### Build once with tests to make check  #### Build once with tests to make check
108  %if %{enable_test}  %if %{enable_test}
109  %configure2_5x $COMMON_ARGS --enable-tests=yes \  %configure2_5x $COMMON_ARGS --enable-tests=yes --enable-systemd \
110                 --enable-verbose-mode=yes \                 --enable-verbose-mode=yes \
111                 --enable-asserts=yes \                 --enable-asserts=yes \
112                 --disable-doxygen-docs \                 --disable-doxygen-docs \
# Line 165  mkdir %{buildroot}%{_datadir}/dbus-%{lib Line 162  mkdir %{buildroot}%{_datadir}/dbus-%{lib
162  # now.  # now.
163  ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service  ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service
164    
 # (cg) dbus.target is no longer used/provided by systemd  
 sed -i 's/^Before=dbus.target$//' %{buildroot}%{_unitdir}/dbus.service  
 rm -rf %{buildroot}%{_unitdir}/dbus.target.wants  
   
165  # link devhelp docs in docdir  # link devhelp docs in docdir
166  mkdir -p %{buildroot}%{_docdir}/%{name}-doc  mkdir -p %{buildroot}%{_docdir}/%{name}-doc
167  pushd %{buildroot}%{_datadir}/devhelp/books/%{name}  pushd %{buildroot}%{_datadir}/devhelp/books/%{name}
# Line 180  popd Line 173  popd
173  #remove unpackaged file  #remove unpackaged file
174  find %{buildroot} -name '*.la' -delete  find %{buildroot} -name '*.la' -delete
175    
 %clean  
 rm -rf %{buildroot}  
   
176  %pre  %pre
177  %_pre_useradd messagebus / /sbin/nologin  %_pre_useradd messagebus / /sbin/nologin
178  %_pre_groupadd daemon messagebus  %_pre_groupadd daemon messagebus
Legend:
Removed from v.234333  
changed lines
  Added in v.260692
  ViewVC Help
Powered by ViewVC 1.1.30