Hello community, here is the log from the commit of package smart checked in at Mon Oct 2 15:21:34 CEST 2006. -------- --- smart/smart.changes 2006-09-26 23:35:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2006-10-02 14:38:12.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 2 14:19:53 CEST 2006 - cthiel@suse.de + +- only build rpmhelper module on dists < 10.1 on x86_64 (fixes #208534) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.g1XONi/_old 2006-10-02 15:21:17.000000000 +0200 +++ /var/tmp/diff_new_pack.g1XONi/_new 2006-10-02 15:21:17.000000000 +0200 @@ -11,10 +11,13 @@ # norootforbuild Name: smart -BuildRequires: kdelibs3-devel python-devel rpm-devel rpm-python update-desktop-files +BuildRequires: kdelibs3-devel python-devel rpm-python update-desktop-files +%if %{suse_version} < 1010 && %{_target_cpu} == 'x86_64' +BuildRequires: rpm-devel +%endif Summary: Smart Package Manager Version: 0.42 -Release: 15 +Release: 17 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -36,6 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-elementtree Requires: python-xml +Requires: rpm-python %py_requires @@ -106,9 +110,12 @@ export CXXFLAGS="$RPM_OPT_FLAGS" python ./setup.py build %{__make} -C contrib/smart-update +# only build rpmhelper on < 10.1, see #208534 +%if %{suse_version} < 1010 && %{_target_cpu} == 'x86_64' pushd contrib/rpmhelper python ./setup.py build popd +%endif pushd contrib/ksmarttray # add missing files or autotools will fail: touch INSTALL NEWS README AUTHORS ChangeLog COPYING @@ -125,10 +132,12 @@ %{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop %{__install} -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications/%{name}-ksmarttray.desktop %{__install} -m 0644 -D smart/interfaces/images/smart.png $RPM_BUILD_ROOT/usr/share/pixmaps/smart.png +%if %{suse_version} < 1010 && %{_target_cpu} == 'x86_64' pushd contrib/rpmhelper python ./setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" cp README ../../README.rpmhelper popd +%endif %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/smart \ $RPM_BUILD_ROOT%{_prefix}/lib/smart \ $RPM_BUILD_ROOT%{_prefix}/lib/smart/plugins \ @@ -152,7 +161,10 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc HACKING IDEAS LICENSE README TODO README.rpmhelper +%doc HACKING IDEAS LICENSE README TODO +%if %{suse_version} < 1010 && %{_target_cpu} == 'x86_64' +%doc README.rpmhelper +%endif %doc doc/* %{_mandir}/man8/* %dir %{_localstatedir}/lib/smart @@ -162,7 +174,9 @@ %{_bindir}/%{name} %{_sbindir}/%{name}-update %{_prefix}/lib/smart/distro.py +%if %{suse_version} < 1010 && %{_target_cpu} == 'x86_64' %{py_sitedir}/rpmhelper.so +%endif %{py_sitedir}/smart %if %{suse_version} > 1010 %{py_sitedir}/*egg-info @@ -184,6 +198,8 @@ /opt/kde3/share/apps/konqueror %changelog -n smart +* Mon Oct 02 2006 - cthiel@suse.de +- only build rpmhelper module on dists < 10.1 on x86_64 (fixes #208534) * Tue Sep 26 2006 - cthiel@suse.de - improved smart-yast-media.patch (fixes #207681) * Sat Sep 23 2006 - aj@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