Hello community, here is the log from the commit of package devhelp checked in at Wed Jan 10 18:07:05 CET 2007. -------- --- GNOME/devhelp/devhelp.changes 2006-12-20 18:24:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/devhelp/devhelp.changes 2007-01-10 17:32:03.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 3 15:17:05 CET 2007 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ devhelp.spec ++++++ --- /var/tmp/diff_new_pack.jo4064/_old 2007-01-10 18:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.jo4064/_new 2007-01-10 18:06:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package devhelp (Version 0.10) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,11 +13,11 @@ Name: devhelp %define xulrunner_version 181 BuildRequires: gcc-c++ gnome-vfs2-devel gtk2-devel intltool libglade2-devel mDNSResponder-devel perl-XML-Parser shared-mime-info update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +# FIXME: Strange: present in libdevhelp-1.0.pc, but not required. +BuildRequires: libgnomeui-devel Summary: Developer's Help Program for GNOME Version: 0.10 -Release: 65 +Release: 71 License: GNU General Public License (GPL) Group: Development/Tools/Other URL: http://developer.imendio.com/wiki/Devhelp @@ -25,7 +25,6 @@ Patch: %{name}-xulrunner.patch Patch1: %{name}-gthread-abort.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Autoreqprov: On %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel Requires: mozilla-xulrunner%{xulrunner_version} @@ -38,8 +37,9 @@ Requires: mozilla %endif %endif -PreReq: shared-mime-info -PreReq: gconf2 +Autoreqprov: On + +%gconf_schemas_prereq %description Devhelp Features - Full indexing of books in XML @@ -64,8 +64,14 @@ Summary: Developer's Help Program For GNOME Group: Development/Tools/Other Autoreqprov: on -Requires: libglade2-devel libgnomeui-devel gtk2-devel gnome-vfs2-devel -# We don't want to check libtool deps - mozilla has hidden libraries: skip-check-libtool-deps +Requires: %{name} = %{version} libglade2-devel libgnomeui-devel gtk2-devel gnome-vfs2-devel +%if %suse_version > 1010 || 0%{?opensuse_bs} +Requires: mozilla-xulrunner%{xulrunner_version}-devel +%else +Requires: gecko-sdk +%endif +# FIXME: Strange: present in libdevhelp-1.0.pc, but not required. +Requires: libgnomeui-devel %description devel Devhelp Features - Full indexing of books in XML. @@ -92,79 +98,73 @@ %patch1 %build -rename no nb po/no.* -sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && \ - mv configure.in.tmp configure.in -autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -Wall" \ -CXXFLAGS="$RPM_OPT_FLAGS -Wall" \ - ./configure \ - --prefix=%{prefix} \ - --libdir=%{prefix}/%{_lib} \ - --sysconfdir=%{sysconfdir} \ - --libexecdir=%{prefix}/%{_lib}/devhelp \ - --enable-platform-gnome2 -make +rm po/no.* +sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in +autoreconf -f -i +%configure +make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %if %suse_version > 910 DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime %endif -cd po -for gmo in *.gmo ; do - install -d $RPM_BUILD_ROOT/opt/gnome/share/locale/${gmo%.gmo}/LC_MESSAGES - install -m0644 $gmo $RPM_BUILD_ROOT/opt/gnome/share/locale/${gmo%.gmo}/LC_MESSAGES/devhelp.mo -done -cd .. -%find_lang %{name} %suse_update_desktop_file -G "Developer Help" %name Documentation +#cd po +#for gmo in *.gmo ; do +# install -d $RPM_BUILD_ROOT%{_datadir}/locale/${gmo%.gmo}/LC_MESSAGES +# install -m0644 $gmo $RPM_BUILD_ROOT%{_datadir}/locale/${gmo%.gmo}/LC_MESSAGES/devhelp.mo +#done +#cd .. +%find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst +rm $RPM_BUILD_ROOT%{_datadir}/mime-info/*.* %clean rm -rf %{buildroot} +%pre -f %{name}.schemas_pre + %post -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/devhelp.schemas >/dev/null -%if %suse_version > 910 -usr/bin/update-mime-database /usr/share/mime >/dev/null -%endif %run_ldconfig +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun %postun -%if %suse_version > 910 -usr/bin/update-mime-database /usr/share/mime >/dev/null -%endif %run_ldconfig +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi -%files -f %{name}.lang +%files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README INSTALL -/etc%{prefix}/gconf/schemas/devhelp.schemas -%{prefix}/bin/devhelp -%{prefix}/%_lib/*.so.* -%{prefix}/share/applications/devhelp.desktop -/opt/gnome/share/devhelp/devhelp.glade -/opt/gnome/share/devhelp/dtd -/opt/gnome/share/devhelp/images -/opt/gnome/share/devhelp/ui -%{prefix}/share/mime-info/*.* -%{prefix}/share/pixmaps/*.png +%{_bindir}/devhelp +%{_datadir}/applications/devhelp.desktop +%{_datadir}/devhelp +%{_datadir}/pixmaps/*.png %if %suse_version > 910 -/usr/share/mime/packages/*.xml +%{_datadir}/mime/packages/*.xml %endif +%{_libdir}/*.so.* %files devel %defattr(-, root, root) -%{prefix}/%_lib/*.so -%{prefix}/%_lib/*.*a -%{prefix}/%_lib/pkgconfig/*.pc -%{prefix}/include/* +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc %changelog -n devhelp +* Wed Jan 03 2007 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Wed Dec 20 2006 - jhargadon@suse.de - added gconf2 as a PreReq in the specfile (#225739) * Thu Nov 30 2006 - sbrabec@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org