![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package lsb checked in at Sat Jun 10 15:40:00 CEST 2006. -------- --- lsb/lsb.changes 2006-05-18 15:24:46.000000000 +0200 +++ lsb/lsb.changes 2006-06-10 14:21:02.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 10 14:20:43 CEST 2006 - kukuk@suse.de + +- Merge back wth lsb-desktop and set version of provides to 3.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsb.spec ++++++ --- /var/tmp/diff_new_pack.j3Z9kh/_old 2006-06-10 15:39:39.000000000 +0200 +++ /var/tmp/diff_new_pack.j3Z9kh/_new 2006-06-10 15:39:39.000000000 +0200 @@ -14,7 +14,8 @@ BuildRequires: glibc-devel-32bit Summary: Linux Standard Base Core Version: 3.1 -Release: 2 +Release: 3 +Obsoletes: lsb-desktop Requires: pax cpio grep gzip Requires: glibc-i18ndata Requires: /usr/bin/ar /usr/bin/at /usr/bin/awk @@ -50,30 +51,61 @@ Requires: /usr/bin/wc /usr/bin/xargs Obsoletes: lsb-runtime Provides: lsb = 2.0 -Provides: lsb-core-noarch = 2.0 lsb-core-noarch = %{version} +Provides: lsb-core-noarch = 2.0 lsb-core-noarch = 3.0 %ifarch %ix86 -Provides: lsb-core-ia32 = 2.0 lsb-core-ia32 = %{version} +Provides: lsb-core-ia32 = 2.0 lsb-core-ia32 = 3.0 %else %ifarch x86_64 -Provides: lsb-core-ia32 = 2.0 lsb-core-ia32 = %{version} -Provides: lsb-core-amd64 = 2.0 lsb-core-amd64 = %{version} +Provides: lsb-core-ia32 = 2.0 lsb-core-ia32 = 3.0 +Provides: lsb-core-amd64 = 2.0 lsb-core-amd64 = 3.0 %else %ifarch s390x -Provides: lsb-core-s390 = 2.0 lsb-core-s390 = %{version} +Provides: lsb-core-s390 = 2.0 lsb-core-s390 = 3.0 %endif %ifarch ppc64 ppc -Provides: lsb-core-ppc32 = 2.0 lsb-core-ppc32 = %{version} +Provides: lsb-core-ppc32 = 2.0 lsb-core-ppc32 = 3.0 %ifarch ppc64 Provides: lsb-core-ppc64 = 2.0 -Provides: lsb-core-ppc64 = %{version} +Provides: lsb-core-ppc64 = 3.0 %endif %else Provides: lsb-core-%{_target_cpu} = 2.0 -Provides: lsb-core-%{_target_cpu} = %{version} +Provides: lsb-core-%{_target_cpu} = 3.0 %endif %endif %endif - +Provides: lsb-graphics-noarch = 2.0 lsb-graphics-noarch = 3.0 +%ifarch %ix86 +Provides: lsb-graphics-ia32 = 2.0 lsb-graphics-ia32 = 3.0 +%else +%ifarch x86_64 +Provides: lsb-graphics-ia32 = 2.0 lsb-graphics-ia32 = 3.0 +Provides: lsb-graphics-amd64 = 2.0 lsb-graphics-amd64 = 3.0 +%else +%ifarch s390x +Provides: lsb-graphics-s390 = 2.0 lsb-graphics-s390 = 3.0 +%endif +%ifarch ppc64 ppc +Provides: lsb-graphics-ppc32 = 2.0 lsb-graphics-ppc32 = 3.0 +%ifarch ppc64 +Provides: lsb-graphics-ppc64 = 2.0 +Provides: lsb-graphics-ppc64 = 3.0 +%endif +%else +Provides: lsb-graphics-%{_target_cpu} = 2.0 +Provides: lsb-graphics-%{_target_cpu} = 3.0 +%endif +%endif +%endif +Requires: xorg-x11-libs Mesa +Requires: fontconfig +Requires: libpng >= 1.2 +Requires: glib2 >= 2.8 +Requires: atk >= 1.10 +Requires: pango >= 1.10 +Requires: gtk2 >= 2.8 +Requires: qt3 >= 3.3.5 +Requires: libxml2 >= 2.6.20 Prefix: /usr License: GPL Source: lsb-release-2.0.tar.bz2 @@ -104,11 +136,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/lsb-release.d install -m644 lsb_release.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ # install place install -m755 lsb_release $RPM_BUILD_ROOT%{_bindir} -echo -n "LSB_VERSION=\"core-2.0-noarch:core-%{version}-noarch:" > $RPM_BUILD_ROOT/etc/lsb-release +echo -n "LSB_VERSION=\"core-2.0-noarch:core-3.0-noarch:" > $RPM_BUILD_ROOT/etc/lsb-release %ifarch %ix86 -echo -n "core-2.0-ia32:core-%{version}-ia32" >> $RPM_BUILD_ROOT/etc/lsb-release +echo -n "core-2.0-ia32:core-3.0-ia32" >> $RPM_BUILD_ROOT/etc/lsb-release %else -echo -n "core-2.0-%{_target_cpu}:core-%{version}-%{_target_cpu}" >> $RPM_BUILD_ROOT/etc/lsb-release +echo -n "core-2.0-%{_target_cpu}:core-3.0-%{_target_cpu}" >> $RPM_BUILD_ROOT/etc/lsb-release %endif echo "\"" >> $RPM_BUILD_ROOT/etc/lsb-release %ifarch x86_64 @@ -151,6 +183,41 @@ ln -sf /lib/ld-linux.so.2 $RPM_BUILD_ROOT/lib/ld-lsb-%{_target_cpu}.so.2 ln -sf /lib/ld-linux.so.2 $RPM_BUILD_ROOT/lib/ld-lsb-%{_target_cpu}.so.3 %endif +mkdir -p $RPM_BUILD_ROOT/etc/lsb-release.d +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-noarch +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-noarch +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-noarch +%ifarch %ix86 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-ia32 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-ia32 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-ia32 +%else +%ifarch x86_64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-amd64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-amd64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-amd64 +%else +%ifarch s390x +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-s390 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-s390 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-s390 +%endif +%ifarch ppc64 ppc +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-ppc32 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-ppc32 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-ppc32 +%ifarch ppc64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-ppc64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-ppc64 +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-ppc64 +%endif +%else +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-2.0-%{_target_cpu} +touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-%{version}-%{_target_cpu} +touch $RPM_BUILD_ROOT/etc/lsb-release.d/desktop-%{version}-%{_target_cpu} +%endif +%endif +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -158,6 +225,7 @@ %files %defattr(-,root,root) %dir /etc/lsb-release.d +/etc/lsb-release.d/* /etc/lsb-release %{_bindir}/lsb_release %{_mandir}/man1/lsb_release.1.gz @@ -183,6 +251,8 @@ %endif %changelog -n lsb +* Sat Jun 10 2006 - kukuk@suse.de +- Merge back wth lsb-desktop and set version of provides to 3.0 * Thu May 18 2006 - kukuk@suse.de - Move lsb-graphics part to lsb-desktop * Tue May 16 2006 - kukuk@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
participants (1)
-
root@suse.de