2006-05-24 Laszlo (Laca) Peter <
[email protected]>
Remove dbus from the build temporarily :(
* SUNWdbus.spec: rename to SUNWdbus.disable
* SUNWevolution.spec: comment out dbus dependency for now
* SUNWgnome-im-client.spec: comment out dbus dependency for now
* SUNWgnome-media-player.spec: comment out dbus dependency for now
* SUNWgnome-pdf-viewer.spec: comment out dbus dependency for now
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/SUNWdbus.disable Wed May 24 19:16:51 2006 +0000
@@ -0,0 +1,129 @@
+#
+# spec file for package SUNWdbus
+#
+# includes module(s): dbus
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include Solaris.inc
+
+%use dbus = dbus.spec
+
+Name: SUNWdbus
+Summary: Simple IPC library based on messages
+Version: %{dbus.version}
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source1: dbus.xml
+Source2: svc-dbus
+%include default-depend.inc
+Requires: SUNWdbus-root
+Requires: SUNWgnome-base-libs
+Requires: SUNWlxml
+Requires: SUNWxwrtl
+Requires: SUNWlexpt
+Requires: SUNWPython-extra
+BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlxml
+BuildRequires: SUNWsfwhea
+BuildRequires: SUNWPython-extra
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: SUNWgnome-base-libs
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%dbus.prep -d %name-%version
+
+%build
+export CFLAGS="%optflags -I/usr/sfw/include"
+export RPM_OPT_FLAGS=$CFLAGS
+export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
+# put /usr/ccs/lib first in the PATH so that cpp is picked up from there
+# note: I didn't put /usr/lib in the PATH because there's too much other
+# stuff in there
+export PATH=/usr/ccs/lib:$PATH
+%dbus.build -d %name-%version
+
+%install
+%dbus.install -d %name-%version
+mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/system
+chmod -R 755 $RPM_BUILD_ROOT/var/svc
+cp %SOURCE1 $RPM_BUILD_ROOT/var/svc/manifest/system/
+mkdir -p $RPM_BUILD_ROOT/lib/svc/method
+chmod -R 755 $RPM_BUILD_ROOT/lib
+cp %SOURCE2 $RPM_BUILD_ROOT/lib/svc/method/
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%if %(test -f /usr/sadm/install/scripts/i.manifest && echo 0 || echo 1)
+%iclass manifest -f i.manifest
+%endif
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/libdbus*
+%dir %attr (0755, root, sys) %dir %{_datadir}
+%{_datadir}/dbus-1
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+%attr (-, root, bin) %{_libdir}/python*
+
+%files root
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %dir %{_sysconfdir}
+%config %{_sysconfdir}/*
+%dir %attr (0755, root, sys) %{_localstatedir}
+%attr (0755, root, sys) %{_localstatedir}/run
+%dir %attr (0755, root, sys) /var/svc
+%dir %attr (0755, root, sys) /var/svc/manifest
+%dir %attr (0755, root, sys) /var/svc/manifest/system
+%class(manifest) %attr (0444, root, sys) /var/svc/manifest/system/dbus.xml
+%attr (0555, root, bin) /lib/svc/method/svc-dbus
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %dir %{_libdir}
+%dir %attr (0755, root, other) %dir %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%{_libdir}/dbus*/include
+%dir %attr (0755, root, bin) %dir %{_includedir}
+%{_includedir}/*
+
+
+%changelog
+* Mon May 08 2006 - [email protected]
+- Add Build/Requires dependency on SUNWPython-extra (for Pyrex) so that python
+ bindings are built.
+
+* Tue May 02 2006 - [email protected]
+- add SMF support (from Artem Kachitchkine)
+
+* Fri Feb 17 2006 - [email protected]
+- Update Build/Requires after running check-deps.pl script.
+
+* Tue Oct 25 2005 - [email protected]
+- Add the include dir under _libdir.
+
+* Fri Oct 21 2005 - [email protected]
+- Initial spec file created.
+
--- a/Solaris/SUNWdbus.spec Wed May 24 13:55:00 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-#
-# spec file for package SUNWdbus
-#
-# includes module(s): dbus
-#
-# Copyright (c) 2005 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
-%include Solaris.inc
-
-%use dbus = dbus.spec
-
-Name: SUNWdbus
-Summary: Simple IPC library based on messages
-Version: %{dbus.version}
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source1: dbus.xml
-Source2: svc-dbus
-%include default-depend.inc
-Requires: SUNWdbus-root
-Requires: SUNWgnome-base-libs
-Requires: SUNWlxml
-Requires: SUNWxwrtl
-Requires: SUNWlexpt
-Requires: SUNWPython-extra
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWlxml
-BuildRequires: SUNWsfwhea
-BuildRequires: SUNWPython-extra
-
-%package devel
-Summary: %{summary} - development files
-SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-Requires: SUNWgnome-base-libs
-
-%package root
-Summary: %{summary} - / filesystem
-SUNW_BaseDir: /
-%include default-depend.inc
-
-%prep
-rm -rf %name-%version
-mkdir %name-%version
-%dbus.prep -d %name-%version
-
-%build
-export CFLAGS="%optflags -I/usr/sfw/include"
-export RPM_OPT_FLAGS=$CFLAGS
-export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib -lexpat"
-# put /usr/ccs/lib first in the PATH so that cpp is picked up from there
-# note: I didn't put /usr/lib in the PATH because there's too much other
-# stuff in there
-export PATH=/usr/ccs/lib:$PATH
-%dbus.build -d %name-%version
-
-%install
-%dbus.install -d %name-%version
-mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/system
-chmod -R 755 $RPM_BUILD_ROOT/var/svc
-cp %SOURCE1 $RPM_BUILD_ROOT/var/svc/manifest/system/
-mkdir -p $RPM_BUILD_ROOT/lib/svc/method
-chmod -R 755 $RPM_BUILD_ROOT/lib
-cp %SOURCE2 $RPM_BUILD_ROOT/lib/svc/method/
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %(test -f /usr/sadm/install/scripts/i.manifest && echo 0 || echo 1)
-%iclass manifest -f i.manifest
-%endif
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/libdbus*
-%dir %attr (0755, root, sys) %dir %{_datadir}
-%{_datadir}/dbus-1
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/man1
-%{_mandir}/man1/*
-%attr (-, root, bin) %{_libdir}/python*
-
-%files root
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %dir %{_sysconfdir}
-%config %{_sysconfdir}/*
-%dir %attr (0755, root, sys) %{_localstatedir}
-%attr (0755, root, sys) %{_localstatedir}/run
-%dir %attr (0755, root, sys) /var/svc
-%dir %attr (0755, root, sys) /var/svc/manifest
-%dir %attr (0755, root, sys) /var/svc/manifest/system
-%class(manifest) %attr (0444, root, sys) /var/svc/manifest/system/dbus.xml
-%attr (0555, root, bin) /lib/svc/method/svc-dbus
-
-%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %dir %{_libdir}
-%dir %attr (0755, root, other) %dir %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%{_libdir}/dbus*/include
-%dir %attr (0755, root, bin) %dir %{_includedir}
-%{_includedir}/*
-
-
-%changelog
-* Mon May 08 2006 - [email protected]
-- Add Build/Requires dependency on SUNWPython-extra (for Pyrex) so that python
- bindings are built.
-
-* Tue May 02 2006 - [email protected]
-- add SMF support (from Artem Kachitchkine)
-
-* Fri Feb 17 2006 - [email protected]
-- Update Build/Requires after running check-deps.pl script.
-
-* Tue Oct 25 2005 - [email protected]
-- Add the include dir under _libdir.
-
-* Fri Oct 21 2005 - [email protected]
-- Initial spec file created.
-
--- a/Solaris/SUNWevolution.spec Wed May 24 13:55:00 2006 +0000
+++ b/Solaris/SUNWevolution.spec Wed May 24 19:16:51 2006 +0000
@@ -41,7 +41,8 @@
Requires: SUNWlxml
Requires: SUNWlibms
Requires: SUNWlibgcrypt
-Requires: SUNWdbus
+#FIXME: put this back when dbus ARC case done
+#Requires: SUNWdbus
Requires: SUNWevolution-data-server
Requires: SUNWgnutls
Requires: SUNWlibgcrypt
--- a/Solaris/SUNWgnome-im-client.spec Wed May 24 13:55:00 2006 +0000
+++ b/Solaris/SUNWgnome-im-client.spec Wed May 24 19:16:51 2006 +0000
@@ -24,7 +24,8 @@
Requires: SUNWgnome-libs
Requires: SUNWPython
Requires: SUNWbash
-Requires: SUNWdbus
+#FIXME: put this back when dbus ARC case done
+#Requires: SUNWdbus
Requires: SUNWevolution-data-server
Requires: SUNWgnome-component
Requires: SUNWgnome-libs
@@ -34,7 +35,8 @@
Requires: SUNWxwrtl
Requires: SUNWpostrun
BuildRequires: SUNWPython-devel
-BuildRequires: SUNWdbus-devel
+#FIXME: put this back when dbus ARC case done
+#BuildRequires: SUNWdbus-devel
BuildRequires: SUNWevolution-data-server-devel
BuildRequires: SUNWgnome-component-devel
BuildRequires: SUNWgnome-libs-devel
@@ -79,8 +81,9 @@
# Move demo to demo directory.
#
-install -d $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin
-mv $RPM_BUILD_ROOT%{_bindir}/gaim-client-example $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin/gaim-client-example
+#FIXME: put this back when dbus ARC case done
+#install -d $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin
+#mv $RPM_BUILD_ROOT%{_bindir}/gaim-client-example $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin/gaim-client-example
%if %build_l10n
%else
@@ -111,7 +114,8 @@
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/*.so*
+#FIXME: put this back when dbus ARC case done
+#%{_libdir}/*.so*
%{_libdir}/gaim/*.so*
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/applications
@@ -129,14 +133,15 @@
%{_includedir}/gaim
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/aclocal
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/gaim.service
-%{_datadir}/doc/gaim
-%dir %attr (0755, root, bin) %dir %{_prefix}/demo
-%dir %attr (0755, root, bin) %dir %{_prefix}/demo/jds
-%dir %attr (0755, root, bin) %dir %{_prefix}/demo/jds/bin
-%{_prefix}/demo/jds/bin/gaim-client-example
+#FIXME: put this back when dbus ARC case done
+#%dir %attr (0755, root, bin) %{_datadir}/dbus-1
+#%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
+#%{_datadir}/dbus-1/services/gaim.service
+#%{_datadir}/doc/
+#%dir %attr (0755, root, bin) %dir %{_prefix}/demo
+#%dir %attr (0755, root, bin) %dir %{_prefix}/demo/jds
+#%dir %attr (0755, root, bin) %dir %{_prefix}/demo/jds/bin
+#%{_prefix}/demo/jds/bin/gaim-client-example
%if %build_l10n
--- a/Solaris/SUNWgnome-media-player.spec Wed May 24 13:55:00 2006 +0000
+++ b/Solaris/SUNWgnome-media-player.spec Wed May 24 19:16:51 2006 +0000
@@ -26,7 +26,8 @@
BuildRequires: SUNWgnome-panel-devel
BuildRequires: SUNWiso-codes-devel
BuildRequires: SUNWgnome-file-mgr
-BuildRequires: SUNWdbus-devel
+#FIXME: put this back when dbus ARC case done
+#BuildRequires: SUNWdbus-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnome-media-devel
BuildRequires: SUNWgnome-vfs-devel
@@ -43,7 +44,8 @@
Requires: SUNWxorg-clientlibs
Requires: SUNWgnome-panel
Requires: SUNWiso-codes
-Requires: SUNWdbus
+#FIXME: put this back when dbus ARC case done
+#Requires: SUNWdbus
Requires: SUNWgnome-config
Requires: SUNWgnome-media
Requires: SUNWgnome-vfs
@@ -173,6 +175,9 @@
rm -f $RPM_BUILD_ROOT%{_datadir}/omf/*/*-??_??.omf
%endif
+#FIXME: delete this when dbus ARC case done
+rm -rf $RPM_BUILD_ROOT%{_datadir}/dbus-1
+
%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):unsupported" $RPM_BUILD_ROOT}
%clean
@@ -204,13 +209,15 @@
%{_libdir}/nautilus/extensions-1.0/lib*.so*
%{_libdir}/bonobo
%{_libdir}/rhythmbox
-%{_libdir}/rhythmbox-metadata
+#FIXME: put this back when dbus ARC case done
+#%{_libdir}/rhythmbox-metadata
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/application-registry
%{_datadir}/applications
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
+#FIXME: put this back when dbus ARC case done
+#%dir %attr (0755, root, bin) %{_datadir}/dbus-1
+#%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
+#%{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
%{_datadir}/gnome/help/rhythmbox/C
%{_datadir}/gnome/help/totem/C
%{_datadir}/gtk-doc
--- a/Solaris/SUNWgnome-pdf-viewer.spec Wed May 24 13:55:00 2006 +0000
+++ b/Solaris/SUNWgnome-pdf-viewer.spec Wed May 24 19:16:51 2006 +0000
@@ -29,7 +29,8 @@
BuildRequires: SUNWPython
BuildRequires: SUNWfontconfig
BuildRequires: SUNWTiff-devel
-BuildRequires: SUNWdbus-devel
+#FIXME: put this back when dbus ARC case done
+#BuildRequires: SUNWdbus-devel
BuildRequires: SUNWgnome-config-devel
BuildRequires: SUNWgnome-vfs-devel
BuildRequires: SUNWjpg-devel
@@ -43,7 +44,8 @@
Requires: SUNWgnome-pdf-viewer-root
Requires: SUNWfontconfig
Requires: SUNWTiff
-Requires: SUNWdbus
+#FIXME: put this back when dbus ARC case done
+#Requires: SUNWdbus
Requires: SUNWfreetype2
Requires: SUNWgnome-config
Requires: SUNWgnome-vfs