Hello community, here is the log from the commit of package nvu checked in at Fri Nov 3 19:03:22 CET 2006. -------- --- nvu/nvu.changes 2006-09-30 08:55:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/nvu/nvu.changes 2006-11-03 17:38:16.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 3 17:36:42 CET 2006 - sbrabec@suse.cz + +- Do not provide and require internal libraries (#216100). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvu.spec ++++++ --- /var/tmp/diff_new_pack.2Z88Rc/_old 2006-11-03 19:03:09.000000000 +0100 +++ /var/tmp/diff_new_pack.2Z88Rc/_new 2006-11-03 19:03:09.000000000 +0100 @@ -13,9 +13,9 @@ Name: nvu BuildRequires: gcc-c++ gtk2-devel krb5-devel libgnome-devel libidl-devel mozilla-nspr-devel orbit-devel tcsh update-desktop-files zip %define NVU 1 -License: GPL, LGPL +License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) Version: 1.0 -Release: 26 +Release: 39 Summary: Web Authoring System URL: http://www.nvu.com/ Group: Productivity/Publishing/HTML/Editors @@ -30,6 +30,8 @@ Patch5: gtk.patch Patch6: nvu-implicit_decl.patch Patch7: dumpstack.patch +%define my_provides %{_builddir}/%{?buildsubdir}/my-provides +%define my_requires %{_builddir}/%{?buildsubdir}/my-requires AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,7 +95,6 @@ make -f client.mk build_all %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT /tmp/nvu_provides /tmp/nvu_requires mkdir -p $RPM_BUILD_ROOT/usr/lib/nvu cp -rL dist/bin/* $RPM_BUILD_ROOT/usr/lib/nvu cp -rL dist/bin/.autoreg $RPM_BUILD_ROOT/usr/lib/nvu @@ -108,26 +109,20 @@ $RPM_BUILD_ROOT/usr/lib/nvu/run-mozilla.sh $RPM_BUILD_ROOT/usr/lib/nvu/regchrome $RPM_BUILD_ROOT/usr/lib/nvu/run-mozilla.sh $RPM_BUILD_ROOT/usr/lib/nvu/nvu-bin -register sed -i s:$RPM_BUILD_ROOT::g $RPM_BUILD_ROOT/usr/lib/nvu/components/xpti.dat -cat << EOF > /tmp/nvu_provides -cat > /dev/null -#! /bin/sh -echo /usr/bin/nvu +# do not export and import any shared libraries to the RPM Requires/Provides +cat << EOF > %{my_provides} +grep -v "\\.so\($\|(\)" | %{__find_provides} EOF -cat << EOF > /tmp/nvu_requires -#! /bin/sh -/usr/lib/rpm/find-requires | -while read ; do - if ! test -e $RPM_BUILD_ROOT/usr/lib/nvu/\${REPLY%%%%(*} ; then #) - echo "\$REPLY" - fi -done +chmod 755 %{my_provides} +%define __find_provides %{my_provides} +cat << EOF > %{my_requires} +grep -v "\\.so\($\|(\)" | %{__find_requires} EOF -chmod 755 /tmp/nvu_provides /tmp/nvu_requires -%define __find_provides /tmp/nvu_provides -%define __find_requires /tmp/nvu_requires +chmod 755 %{my_requires} +%define __find_requires %{my_requires} %clean -rm -rf $RPM_BUILD_ROOT /tmp/nvu_provides /tmp/nvu_requires +rm -rf $RPM_BUILD_ROOT %files %defattr (-, root, root) @@ -136,6 +131,8 @@ /usr/share/*/nvu.* %changelog -n nvu +* Fri Nov 03 2006 - sbrabec@suse.cz +- Do not provide and require internal libraries (#216100). * Sat Sep 30 2006 - aj@suse.de - Cleanup BuildRequires. * Wed Feb 15 2006 - stbinner@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org