openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2007
- 1 participants
- 1082 discussions
Hello community,
here is the log from the commit of package ghostscript-library
checked in at Thu May 31 20:52:57 CEST 2007.
--------
--- ghostscript-library/ghostscript-library.changes 2007-05-24 01:41:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/ghostscript-library/ghostscript-library.changes 2007-05-29 14:59:50.957627000 +0200
@@ -1,0 +2,8 @@
+Tue May 29 14:51:55 CEST 2007 - werner(a)suse.de
+
+- Remove not required devel files
+- RPMlint: ignore omni .so files too because those are files are
+ required and loaded with dlopen by the omni library.
+- RPMlint: Move some gimpprint devel files into libgimpprint-devel
+
+-------------------------------------------------------------------
ghostscript-mini.changes: same change
New:
----
rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghostscript-library.spec ++++++
--- /var/tmp/diff_new_pack.m30693/_old 2007-05-31 20:52:35.000000000 +0200
+++ /var/tmp/diff_new_pack.m30693/_new 2007-05-31 20:52:35.000000000 +0200
@@ -45,8 +45,8 @@
Autoreqprov: on
Summary: Necessary Files for Running Ghostscript
Version: 8.15.3
-Release: 58
-License: GNU General Public License (GPL)
+Release: 61
+License: GNU General Public License (GPL), Includes now the full implemented version of pdf_sec.ps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: espgs-%{GSVER}.tar.bz2
Source1: jpegsrc.v%{JPEG}.tar.bz2
@@ -67,6 +67,7 @@
Source30: gs550j03.tar.bz2
Source40: fonts.scale.nimbus-sans-condensed
Source50: glib-config
+Source60: rpmlintrc
Patch0: espgs-%{GSVER}.dif
Patch1: espgs-8.15.2rc1-pdfrange.dif
Patch2: espgs-8.15.2rc1-pdfsec.dif
@@ -212,7 +213,7 @@
%package -n libgimpprint
Version: 4.2.7
-Release: 135
+Release: 138
Summary: Gimp-Print libraries
Group: Development/Libraries/C and C++
@@ -227,7 +228,7 @@
%package -n libgimpprint-devel
Version: 4.2.7
-Release: 135
+Release: 138
Requires: %install_info_prereq
Summary: Gimp-Print Include Files
Group: Development/Libraries/C and C++
@@ -576,6 +577,10 @@
make -f unix.mak prefix=${RPM_BUILD_ROOT}/usr libdir=${RPM_BUILD_ROOT}%{_libdir} install
cd ../
rm -f ${RPM_BUILD_ROOT}/usr/bin/ijs_client_example
+chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/libijs.a
+chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_server.h
+chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_client.h
+chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs.h
#
# stp:
# Do never add -j here!
@@ -697,6 +702,11 @@
ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \
${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/
%endif
+# Remove oldish libraries and headers from ijs
+rm -vf ${RPM_BUILD_ROOT}/usr/bin/ijs-config
+rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.a
+rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.so
+rm -vrf ${RPM_BUILD_ROOT}/usr/include/ijs
#
##############################################################
#
@@ -774,7 +784,7 @@
%config %attr(-,lp,sys) /etc/cups/pstoraster.convs
/usr/bin/dumphint
# /usr/bin/escputil
-/usr/bin/ijs-config
+# /usr/bin/ijs-config
/usr/bin/ijsgimpprint
/usr/bin/pcl3opts
%endif # if not ghostscript-mini
@@ -822,12 +832,12 @@
%if %libgs
%{_libdir}/libgs.so*
%endif
-%{_libdir}/libijs.a
-%{_libdir}/libijs.so
-%dir /usr/include/ijs
-/usr/include/ijs/ijs.h
-/usr/include/ijs/ijs_client.h
-/usr/include/ijs/ijs_server.h
+# %{_libdir}/libijs.a
+# %{_libdir}/libijs.so
+# %dir /usr/include/ijs
+# /usr/include/ijs/ijs.h
+# /usr/include/ijs/ijs_client.h
+# /usr/include/ijs/ijs_server.h
%endif
%dir /usr/share/ghostscript
%dir /usr/share/ghostscript/%{GSMAIN}
@@ -1105,18 +1115,26 @@
%files -n libgimpprint
%defattr(-, root, root)
/usr/bin/gimpprint-config
-%{_libdir}/libgimpprint*
+%{_libdir}/libgimpprint.so.*
/usr/share/locale/*/LC_MESSAGES/gimp-print.mo
%files -n libgimpprint-devel
%defattr(-, root, root)
/usr/share/aclocal/gimpprint.m4
/usr/include/gimp-print
+%{_libdir}/libgimpprint.so
+%{_libdir}/libgimpprint.la
+%{_libdir}/libgimpprint.a
%doc %{_mandir}/man*/gimpprint*
%doc %{_infodir}/gimpprint.*
%endif # if not ghostscript-mini
%changelog
+* Tue May 29 2007 - werner(a)suse.de
+- Remove not required devel files
+- RPMlint: ignore omni .so files too because those are files are
+ required and loaded with dlopen by the omni library.
+- RPMlint: Move some gimpprint devel files into libgimpprint-devel
* Thu May 24 2007 - ro(a)suse.de
- added ldconfig to post scripts
* Thu Mar 29 2007 - aj(a)suse.de
++++++ ghostscript-mini.spec ++++++
--- /var/tmp/diff_new_pack.m30693/_old 2007-05-31 20:52:35.000000000 +0200
+++ /var/tmp/diff_new_pack.m30693/_new 2007-05-31 20:52:35.000000000 +0200
@@ -45,8 +45,8 @@
Autoreqprov: on
Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript)
Version: 8.15.3
-Release: 41
-License: GNU General Public License (GPL)
+Release: 44
+License: GNU General Public License (GPL), Includes now the full implemented version of pdf_sec.ps
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: espgs-%{GSVER}.tar.bz2
Source1: jpegsrc.v%{JPEG}.tar.bz2
@@ -67,6 +67,7 @@
Source30: gs550j03.tar.bz2
Source40: fonts.scale.nimbus-sans-condensed
Source50: glib-config
+Source60: rpmlintrc
Patch0: espgs-%{GSVER}.dif
Patch1: espgs-8.15.2rc1-pdfrange.dif
Patch2: espgs-8.15.2rc1-pdfsec.dif
@@ -204,7 +205,7 @@
%package -n libgimpprint
Version: 4.2.7
-Release: 135
+Release: 138
Summary: Gimp-Print libraries
Group: Development/Libraries/C and C++
@@ -219,7 +220,7 @@
%package -n libgimpprint-devel
Version: 4.2.7
-Release: 135
+Release: 138
Requires: %install_info_prereq
Summary: Gimp-Print Include Files
Group: Development/Libraries/C and C++
@@ -568,6 +569,10 @@
make -f unix.mak prefix=${RPM_BUILD_ROOT}/usr libdir=${RPM_BUILD_ROOT}%{_libdir} install
cd ../
rm -f ${RPM_BUILD_ROOT}/usr/bin/ijs_client_example
+chmod 0644 ${RPM_BUILD_ROOT}%{_libdir}/libijs.a
+chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_server.h
+chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs_client.h
+chmod 0644 ${RPM_BUILD_ROOT}/usr/include/ijs/ijs.h
#
# stp:
# Do never add -j here!
@@ -689,6 +694,11 @@
ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \
${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/
%endif
+# Remove oldish libraries and headers from ijs
+rm -vf ${RPM_BUILD_ROOT}/usr/bin/ijs-config
+rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.a
+rm -vf ${RPM_BUILD_ROOT}%{_libdir}/libijs.so
+rm -vrf ${RPM_BUILD_ROOT}/usr/include/ijs
#
##############################################################
#
@@ -766,7 +776,7 @@
%config %attr(-,lp,sys) /etc/cups/pstoraster.convs
/usr/bin/dumphint
# /usr/bin/escputil
-/usr/bin/ijs-config
+# /usr/bin/ijs-config
/usr/bin/ijsgimpprint
/usr/bin/pcl3opts
%endif # if not ghostscript-mini
@@ -814,12 +824,12 @@
%if %libgs
%{_libdir}/libgs.so*
%endif
-%{_libdir}/libijs.a
-%{_libdir}/libijs.so
-%dir /usr/include/ijs
-/usr/include/ijs/ijs.h
-/usr/include/ijs/ijs_client.h
-/usr/include/ijs/ijs_server.h
+# %{_libdir}/libijs.a
+# %{_libdir}/libijs.so
+# %dir /usr/include/ijs
+# /usr/include/ijs/ijs.h
+# /usr/include/ijs/ijs_client.h
+# /usr/include/ijs/ijs_server.h
%endif
%dir /usr/share/ghostscript
%dir /usr/share/ghostscript/%{GSMAIN}
@@ -1097,18 +1107,26 @@
%files -n libgimpprint
%defattr(-, root, root)
/usr/bin/gimpprint-config
-%{_libdir}/libgimpprint*
+%{_libdir}/libgimpprint.so.*
/usr/share/locale/*/LC_MESSAGES/gimp-print.mo
%files -n libgimpprint-devel
%defattr(-, root, root)
/usr/share/aclocal/gimpprint.m4
/usr/include/gimp-print
+%{_libdir}/libgimpprint.so
+%{_libdir}/libgimpprint.la
+%{_libdir}/libgimpprint.a
%doc %{_mandir}/man*/gimpprint*
%doc %{_infodir}/gimpprint.*
%endif # if not ghostscript-mini
%changelog
+* Tue May 29 2007 - werner(a)suse.de
+- Remove not required devel files
+- RPMlint: ignore omni .so files too because those are files are
+ required and loaded with dlopen by the omni library.
+- RPMlint: Move some gimpprint devel files into libgimpprint-devel
* Tue Dec 05 2006 - werner(a)suse.de
- Make sgirgb driver more robust on itanium (bug #209879)
* Tue Nov 07 2006 - werner(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package firmwarekit
checked in at Thu May 31 20:50:30 CEST 2007.
--------
--- arch/i386/firmwarekit/firmwarekit.changes 2006-12-06 14:41:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/firmwarekit/firmwarekit.changes 2007-05-30 15:26:43.339396000 +0200
@@ -1,0 +2,13 @@
+Wed May 30 15:11:14 CEST 2007 - trenn(a)suse.de
+
+- also build for ia64
+- use "$@" to pass args correctly from biostest.sh to biostest
+- move from /usr/share to /usr/lib
+- ripped out a lot patches that went mainline
+- updated to release 2
+- there are still some bugs to fix, package is building and working
+ half way correctly (plugin specifc things to fix) now. I will
+ wait until next version with patches applied comes out to get out
+ of patch nightmare.
+
+-------------------------------------------------------------------
Old:
----
busy_box_adjustment.patch
compile_errors.patch
firmwarekit-r1.102.tar.bz2
New:
----
acpi_compile_cleanup.patch
chk_hpet_cleanup.patch
cpufreq_cleanup.patch
debug.patch
ebda_cleanup.patch
fan_cleanup.patch
firmwarekit-2.tar.bz2
libstandalone_soname.patch
maxreadreq_cleanup.patch
suspend_cleanup.patch
virt_cleanup.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ firmwarekit.spec ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package firmwarekit (Version r1.102)
+# spec file for package firmwarekit (Version 2)
#
-# 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.
#
@@ -14,8 +14,8 @@
BuildRequires: bash coreutils dhclient dhcp-client findutils gawk gdb glib2 glib2-devel glibc grep iproute2 libacl libattr module-init-tools ncurses newt newt-devel pciutils pcre perl pkgconfig pmtools sed sharutils slang slang-devel sysvinit termcap util-linux wget xorg-x11-util-devel
URL: http://www.linuxfirmwarekit.org
Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines
-Version: r1.102
-Release: 9
+Version: 2
+Release: 1
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Boot
Autoreqprov: on
@@ -23,7 +23,7 @@
Requires: pmtools hwinfo util-linux
Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64
+ExclusiveArch: %ix86 x86_64 ia64
Source0: %{name}-%{version}.tar.bz2
Patch0: adjust_paths.patch
Patch1: biostest_sh.patch
@@ -34,10 +34,17 @@
Patch6: use_external_pmtool_bins.patch
Patch7: path_environment.patch
Patch8: dmesg_adjust.patch
-Patch9: compile_errors.patch
-Patch10: colors.patch
-Patch11: check_plugin_results.patch
-Patch12: busy_box_adjustment.patch
+Patch9: colors.patch
+Patch10: libstandalone_soname.patch
+Patch11: acpi_compile_cleanup.patch
+Patch12: cpufreq_cleanup.patch
+Patch13: chk_hpet_cleanup.patch
+Patch14: fan_cleanup.patch
+Patch15: suspend_cleanup.patch
+Patch16: virt_cleanup.patch
+Patch17: maxreadreq_cleanup.patch
+Patch18: ebda_cleanup.patch
+Patch19: debug.patch
%description
This tool, developed by Intel, is meant for vendors to validate and
@@ -66,6 +73,15 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+# This is arch specific stuff, put all in /usr/lib/firmwarekit
+%define location /usr/lib/%{name}
%build
make -e CFLAGS="$RPM_OPT_FLAGS"
@@ -75,30 +91,48 @@
install -d -m 755 %{buildroot}/var/log/%{name}
install -D -m 644 initramfs/results.css %{buildroot}/var/log/%{name}/results.css
install -D -m 644 initramfs/resources.css %{buildroot}/var/log/%{name}/resources.css
-install -D -m 744 biostest %{buildroot}/usr/share/%{name}/biostest
-install -D -m 755 shelltools/start_test %{buildroot}/usr/share/%{name}/bin/start_test
-ln -s start_test %{buildroot}/usr/share/%{name}/bin/announce_resource
-ln -s start_test %{buildroot}/usr/share/%{name}/bin/finish_test
-ln -s start_test %{buildroot}/usr/share/%{name}/bin/report_result
-ln -s start_test %{buildroot}/usr/share/%{name}/bin/report_testrun_progress
-install -D -m 755 libstandalone.so %{buildroot}/%{_libdir}/libstandalone.so
-cp -a plugins %{buildroot}/usr/share/%{name}/plugins
+install -D -m 744 biostest %{buildroot}/%{location}/biostest
+install -D -m 755 shelltools/start_test %{buildroot}/%{location}/bin/start_test
+ln -s start_test %{buildroot}/%{location}/bin/announce_resource
+ln -s start_test %{buildroot}/%{location}/bin/finish_test
+ln -s start_test %{buildroot}/%{location}/bin/report_result
+ln -s start_test %{buildroot}/%{location}/bin/report_testrun_progress
+install -D -m 755 libstandalone.so %{buildroot}/%{_libdir}/libstandalone.so.%{version}.%{release}
+ln -s libstandalone.so.%{version}.%{release} %{buildroot}/%{_libdir}/libstandalone.so.%{version}
+cp -a plugins %{buildroot}/%{location}/plugins
install -D -m 644 Documentation/QUICKSTART.txt %{buildroot}/%{_docdir}/%{name}/QUICKSTART.txt
install -D -m 644 Documentation/USERGUIDE.txt %{buildroot}/%{_docdir}/%{name}/USERGUIDE.tx
gzip biostest.1
install -D -m 644 biostest.1.gz %{buildroot}/%{_mandir}/man1/biostest.1.gz
chmod 644 %{buildroot}/%{_mandir}/man1/biostest.1.gz
+%post
+%run_ldconfig
+
+%postun
+%run_ldconfig
+
%files
%defattr(-,root,root)
/usr/sbin/biostest.sh
-/usr/share/%{name}
+%{location}
/var/log/%{name}
-/%{_libdir}/libstandalone.so
+/%{_libdir}/libstandalone.so.%{version}
+/%{_libdir}/libstandalone.so.%{version}.%{release}
%{_docdir}/%{name}
%{_mandir}/man1/biostest.1.gz
-%changelog -n firmwarekit
+%changelog
+* Wed May 30 2007 - trenn(a)suse.de
+- also build for ia64
+- use "$@" to pass args correctly from biostest.sh to biostest
+- move from /usr/share to /usr/lib
+- ripped out a lot patches that went mainline
+- updated to release 2
+- there are still some bugs to fix, package is building and working
+ half way correctly (plugin specifc things to fix) now. I will
+ wait until next version with patches applied comes out to get out
+ of patch nightmare.
* Wed Dec 06 2006 - dmueller(a)suse.de
- don't build as root
* Fri Nov 24 2006 - trenn(a)suse.de
++++++ acpi_compile_cleanup.patch ++++++
Index: firmwarekit/acpicompile/acpicompile.c
===================================================================
--- firmwarekit.orig/acpicompile/acpicompile.c
+++ firmwarekit/acpicompile/acpicompile.c
@@ -35,6 +35,8 @@
static int current_ssdt; /* Which DSDT or SSDT table we're dealing with */
+extern void load_dsdt_ssdts();
+
/* parses an iasl output line, returns the line no. that
* the error or warning is referencing */
@@ -77,8 +79,6 @@ static void do_table(char *filename)
{
FILE *file;
char line[4096];
- char output[8192];
- char uri[4096];
char command[4096];
int errlineno;
++++++ adjust_doc.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200
@@ -3,50 +3,6 @@
biostest.1 | 85 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 7 deletions(-)
-Index: firmwarekit/Documentation/QUICKSTART.txt
-===================================================================
---- firmwarekit.orig/Documentation/QUICKSTART.txt
-+++ firmwarekit/Documentation/QUICKSTART.txt
-@@ -3,22 +3,32 @@
- QUICK START
- ============================================
-
--- STEP 1: Boot the Firmware Dev Kit CD from the cd-rom.
-+- STEP 1: Either:
-+ Boot the Firmware Dev Kit CD from the cd-rom
-+ (Burn the bootable iso /usr/share/firmwarekit/firmwarekit.iso
-+ included in the firmwarekit-iso package).
-
--- STEP 2: At black boot screen, press [ENTER] to start the automated tests.
-+ or
-
--- STEP 3: After a 5 second welcome screen, the tests will start. When tests are complete, a test results page will show.
-+ Start the biostest executable
-+ (included in the firmwarekit base package)
-
--- STEP 4: Use up and down arrow keys and press [ENTER] on a line-item for more details on it.
-+- STEP 2: At black boot screen, press [ENTER] to start the automated tests.
-
--- STEP 5: To save the test results on a USB key, insert a USB key and <tab> over to 'Save on USB' option, press [ENTER].
-+- STEP 3: After a 5 second welcome screen, the tests will start. When tests
-+ are complete, a test results page will show.
-
--- STEP 6: To exit, <tab> over to 'Exit' and press [ENTER].
-+- STEP 4: Use up and down arrow keys and press [ENTER] on a line-item for
-+ more details on it.
-
-+- STEP 5: To save the test results on a USB key, insert a USB key and
-+ <tab> over to 'Save on USB' option, press [ENTER].
-
--** For more detailed information on running the Firmware Dev Kit automated and manual tests, please see the USERGUIDE.txt for more information.
-+- STEP 6: To exit, <tab> over to 'Exit' and press [ENTER].
-
-
-+** For more detailed information on running the Firmware Dev Kit automated and
-+ manual tests, please see the USERGUIDE.txt for more information.
-
- Contributer: Rolla Selbak (rolla.n.selbak(a)intel.com)
-
Index: firmwarekit/biostest.1
===================================================================
--- /dev/null
@@ -57,7 +13,7 @@
+.SH NAME
+biostest.sh \- starts the linux firmwarekit which checks the BIOS for linux compatiblity
+.SH SYNOPSIS
-+.B biostest.sh [ do_not_block ] [ ssh_save=host:/dir ] [ console=ttySx,speed ] [ safemode ]
++.B biostest.sh [ noninteractive ] [ saveovernet=host:/dir ] [ console=ttySx,speed ] [ safemode ]
+.SH DESCRIPTION
+.BI biostest.sh
+Biostest checks your firmware for linux compatibility.
@@ -80,11 +36,11 @@
+\-.
+
+.TP
-+.I do_not_block
++.I noninteractive
+Biostest will exit after checks have been performed and results have been
-+written
++written.
+.TP
-+.I ssh_save=host:/dir
++.I saveovernet=host:/dir
+Specify a destinition in scp syntax to save the results to. This might break
+a bit the ncurses/newt windows as scp requires a password from stdin.
+If you want to automate the test you can use ssh keys (so that you don't have
++++++ adjust_paths.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200
@@ -13,21 +13,33 @@
}
- system("/bin/cp results/* /usbkey &> /dev/null");
+ system("/bin/cp -rf /var/log/firmwarekit /usbkey &> /dev/null");
- system("/bin/cp acpidump /usbkey &> /dev/null");
+ system("/bin/cp acpi.dump /usbkey &> /dev/null");
system("/bin/cp DSDT.* /usbkey &> /dev/null");
system("/bin/umount /usbkey &> /dev/null");
Index: firmwarekit/tests.c
===================================================================
--- firmwarekit.orig/tests.c
+++ firmwarekit/tests.c
-@@ -199,8 +199,8 @@ void sort_results(void)
+@@ -199,15 +199,17 @@ void sort_results(void)
void dump_results(void)
{
- dump_xml(all_tests, "results/results.xml");
+- dump_text(all_tests, "results/results.txt");
- dump_xml_resources("results/resources.xml");
+ dump_xml(all_tests, "/var/log/firmwarekit/results.xml");
+ dump_xml_resources("/var/log/firmwarekit/resources.xml");
++ dump_text(all_tests, "/var/log/firmwarekit/results.txt");
++ dump_xml_resources("/var/log/firmwarekit/resources.xml");
++
show_results_ui(all_tests);
}
+ void dump_xml_results(void)
+ {
+- dump_xml(all_tests, "results/results.xml");
+- dump_xml_resources("results/resources.xml");
++ dump_xml(all_tests, "/var/log/firmwarekit/results.xml");
++ dump_xml_resources("/var/log/firmwarekit/resources.xml");
+ }
+ void show_results(void)
++++++ biostest_sh.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200
@@ -9,7 +9,7 @@
@@ -0,0 +1,15 @@
+#!/bin/bash
+
-+DIR="/usr/share/firmwarekit"
++DIR="/usr/lib/firmwarekit"
+OUTPUT_DIR="/var/log/firmwarekit"
+
+if [ ! -d "$DIR" ];then
@@ -19,6 +19,6 @@
+
+
+pushd "$DIR"
-+./biostest $*
++./biostest "$@"
+popd
+
++++++ chk_hpet_cleanup.patch ++++++
Index: firmwarekit/chk_hpet/chk_hpet.c
===================================================================
--- firmwarekit.orig/chk_hpet/chk_hpet.c
+++ firmwarekit/chk_hpet/chk_hpet.c
@@ -151,8 +151,6 @@ int main(int argc, char ** argv)
int fd, ret;
int hpet_status;
char uri[1024];
- GList *list;
- char line[4096];
start_test("chk_hpet", "HPET configuration test",
"This test checks the HPET PCI BAR for each timer block in the timer."
++++++ colors.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200
@@ -22,7 +22,7 @@
+ newtSetColors(newtDefaultColorPalette);
newtInit();
newtCls();
- newtDrawRootText(0,0, " Linux-ready Firmware Developer Kit - Release 0 - (C) 2006 Intel Corporation");
+ newtDrawRootText(0,0, " Linux-ready Firmware Developer Kit - Release 2 - (C) 2007 Intel Corporation");
Index: firmwarekit/colors.h
===================================================================
--- /dev/null
++++++ cpufreq_cleanup.patch ++++++
Index: firmwarekit/cpufreq/cpufreq.c
===================================================================
--- firmwarekit.orig/cpufreq/cpufreq.c
+++ firmwarekit/cpufreq/cpufreq.c
@@ -234,7 +234,7 @@ static char *HzToHuman(unsigned long hz)
-static unsigned long long get_claimed_hz(int cpunr)
+static unsigned long get_claimed_hz(int cpunr)
{
FILE *file;
char path[PATH_MAX];
@@ -355,7 +355,7 @@ static void do_cpu(int cpunr)
if (freqs[i].Hz > get_claimed_hz(cpunr) && !warned_PSS) {
char outbuf[4096];
warned_PSS = 1;
- sprintf(outbuf, "Frequency %i not achievable; _PSS limit of %i in effect?", freqs[i].Hz, get_claimed_hz(cpunr));
+ sprintf(outbuf, "Frequency %lu not achievable; _PSS limit of %lu in effect?", freqs[i].Hz, get_claimed_hz(cpunr));
report_result("cpufreq", WARN, outbuf, NULL, NULL);
}
}
++++++ debug.patch ++++++
Index: firmwarekit/chk_hpet/chk_hpet.c
===================================================================
--- firmwarekit.orig/chk_hpet/chk_hpet.c
+++ firmwarekit/chk_hpet/chk_hpet.c
@@ -44,7 +44,7 @@
#define VENDOR_ID_INTEL (0x8086)
extern GList *boot_dmesg;
-extern void load_boot_dmesg_buffer();
+extern void load_boot_dmesg_buffer(int announce);
extern GList *ssdt[];
extern void load_dsdt_ssdts();
@@ -100,6 +100,8 @@ static void check_hpet_base(gpointer dat
{
char *line = (char *) data;
char *val, *c;
+ printf("%s - %s", __FUNCTION__, line);
+
if ((val = strstr(line, "ACPI: HPET id:")) != NULL) {
c= strstr(line, "base: ");
if (c)
@@ -160,7 +162,7 @@ int main(int argc, char ** argv)
memset(uri, 0, 1024);
- load_boot_dmesg_buffer();
+ load_boot_dmesg_buffer(0);
if (boot_dmesg != NULL)
g_list_foreach(boot_dmesg, check_hpet_base, &hpet_status);
else
Index: firmwarekit/dmesg.c
===================================================================
--- firmwarekit.orig/dmesg.c
+++ firmwarekit/dmesg.c
@@ -40,6 +40,7 @@ extern char *current_test;
/* Obtains dmesg, cleans it up, and adds it to our resource list.
* The boot_dmesg here is usually accessed by non-standalone tests
* (i.e. *.so tests) */
+#ifdef XYZ
void get_dmesg_buffer(void)
{
char *dmesg;
@@ -66,6 +67,8 @@ void get_dmesg_buffer(void)
in further calls... */
klogctl (5, NULL, 0);
+ fprintf (stderr, "Try to open file: %s\n", DMESG_FILE);
+
f_dmesg = fopen (DMESG_FILE, "r");
if (f_dmesg == NULL){
fprintf (stderr, "WARN: Could not open "DMESG_FILE);
@@ -91,9 +94,12 @@ void get_dmesg_buffer(void)
c2=c1;
if (strlen(c1)>3 && c1[0]=='<' && c1[2]=='>'){
c2+=3;
+ fprintf (stderr, "Insert line: %s\n", c2);
boot_dmesg = g_list_append(boot_dmesg, strdup(c2));
linecount ++;
}
+ else
+ fprintf (stderr, "Do not insert line: %s\n", c1);
}
fclose(f_dmesg);
@@ -101,6 +107,7 @@ void get_dmesg_buffer(void)
free(dmesg);
}
+#endif
/* check for common dmesg errors */
void dmesg_common_errors(char *line, char *suggested_uri)
Index: firmwarekit/libstandalone.c
===================================================================
--- firmwarekit.orig/libstandalone.c
+++ firmwarekit/libstandalone.c
@@ -30,7 +30,6 @@
#include "biostest.h"
-GList *boot_dmesg = NULL; /* Holds dmesg info, accessed by standalone tests */
GList *ssdt[MAX_SSDTS]; /* Holds DSDT and SSDT tables, accessed by stndaln tests */
@@ -142,40 +141,6 @@ void announce_resource(char *uri, char *
fflush(stdout);
}
-
-/* Obtains the dmesg kernel buffer. The boot_dmesg here is usually
- * accessed by standalone tests (i.e. *.exe) */
-void load_boot_dmesg_buffer(void)
-{
- char line [4096];
- FILE *file;
-
- if(boot_dmesg != NULL)
- return;
-
- memset(line, 0, 4096);
-
- /* First, try to access the tmp dmesg output that
- * get_dmesg_buffer() created. If it doesn't exist,
- * we're in standlone mode, and we should access
- * the local dmesg file. */
- if (access(DMESG_FILE, R_OK))
- file = fopen(DMESG_LOCAL_FILE, "r");
- else
- file = fopen(DMESG_FILE, "r");
-
- if (!file)
- return;
-
- while (!feof(file)) {
- if (fgets(line, 4095, file)==NULL)
- break;
- boot_dmesg = g_list_append(boot_dmesg, strdup(line));
- }
-
- fclose(file);
-}
-
void load_dsdt_ssdts(void) {
int ret, i;
@@ -197,7 +162,7 @@ void load_dsdt_ssdts(void) {
sprintf(cmd_prefix, "plugins/");
/* create hex-dump format of all acpi tables in file 'acpi.dump' */
- sprintf(command, "%sacpidump > acpi.dump &> /dev/null", cmd_prefix);
+ sprintf(command, "%sacpidump > acpi.dump 2> /dev/null", cmd_prefix);
system(command);
if (access("acpi.dump", R_OK))
fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n");
Index: firmwarekit/main.c
===================================================================
--- firmwarekit.orig/main.c
+++ firmwarekit/main.c
@@ -220,7 +220,8 @@ int main(int argc, char **argv)
/* get and parse demsg for useful info
* (implemented in dmesg.c) */
- get_dmesg_buffer();
+// get_dmesg_buffer();
+ load_boot_dmesg_buffer(1);
/* obtain dsdt and ssdt acpi tables' resources */
get_dsdt_resources();
Index: firmwarekit/lib.c
===================================================================
--- firmwarekit.orig/lib.c
+++ firmwarekit/lib.c
@@ -35,6 +35,57 @@
#include "biostest.h"
+GList *boot_dmesg = NULL; /* Holds dmesg info, accessed by standalone tests */
+
+/* Obtains the dmesg kernel buffer. The boot_dmesg here is usually
+ * accessed by standalone tests (i.e. *.exe) */
+void load_boot_dmesg_buffer(int announce)
+{
+ char line [4096];
+ FILE *file;
+
+ fprintf (stderr, "XXX boot_dmesg != NULL\n");
+ if(boot_dmesg != NULL)
+ return;
+
+ fprintf (stderr, "boot_dmesg != NULL\n");
+
+ memset(line, 0, 4096);
+
+ /* First, try to access the tmp dmesg output that
+ * get_dmesg_buffer() created. If it doesn't exist,
+ * we're in standlone mode, and we should access
+ * the local dmesg file. */
+ if (access(DMESG_FILE, R_OK)){
+ file = fopen(DMESG_LOCAL_FILE, "r");
+ fprintf(stderr, "%s is accessed\n", DMESG_LOCAL_FILE);
+ }
+ else{
+ file = fopen(DMESG_FILE, "r");
+ fprintf(stderr, "%s is accessed\n", DMESG_FILE);
+ }
+
+ if (!file){
+ fprintf(stderr, "ERRRR Could not access dmesg file\n", DMESG_LOCAL_FILE);
+ return;
+ }
+
+ while (!feof(file)) {
+ if (fgets(line, 4095, file)==NULL)
+ break;
+ if (announce){
+ fprintf(stderr, "Appening and announcing: %s\n", line);
+ announce_resource("dmesg://<3>", line, NULL);
+ }
+ else
+ fprintf(stderr, "Append: %s\n", line);
+ boot_dmesg = g_list_append(boot_dmesg, strdup(line));
+ }
+
+ fclose(file);
+}
+
+
char *scatprintf(char *buffer, const char *fmt, ...)
{
char *vasprintf_buffer;
Index: firmwarekit/edd/edd.c
===================================================================
--- firmwarekit.orig/edd/edd.c
+++ firmwarekit/edd/edd.c
@@ -37,7 +37,7 @@
#include <firmwarekit.h>
-extern void load_boot_dmesg_buffer();
+extern void load_boot_dmesg_buffer(int announce);
static int edd_abort;
@@ -363,7 +363,7 @@ int main(int argc, char **argv)
"(can) have multiple disks. Linux distributions increasingly depend on this info "
"to find out on which device to install the bootloader.");
- load_boot_dmesg_buffer();
+ load_boot_dmesg_buffer(0);
if(boot_dmesg != NULL)
g_list_foreach(boot_dmesg, check_line, NULL);
else
Index: firmwarekit/mtrr/mtrr.c
===================================================================
--- firmwarekit.orig/mtrr/mtrr.c
+++ firmwarekit/mtrr/mtrr.c
@@ -45,7 +45,7 @@
#define WRITETHROUGH 8
#define DEFAULT 16
-extern void load_boot_dmesg_buffer();
+extern void load_boot_dmesg_buffer(int announce);
extern GList *boot_demsg;
struct mtrr_entry {
@@ -356,7 +356,7 @@ static void do_manual_mtrr_test(void)
validate_iomem();
- load_boot_dmesg_buffer();
+ load_boot_dmesg_buffer(0);
if(boot_dmesg != NULL)
g_list_foreach(boot_dmesg, check_line, NULL);
else
++++++ dmesg_adjust.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:14.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:14.000000000 +0200
@@ -7,25 +7,18 @@
===================================================================
--- firmwarekit.orig/dmesg.c
+++ firmwarekit/dmesg.c
-@@ -67,22 +67,42 @@ static void check_this_line(gpointer dat
- }
- }
-
-+#define DMESG_FILE "/var/log/boot.msg"
- /* obtains demsg, cleans it up, and adds it to our resource list */
- void get_dmesg_buffer(void)
+@@ -44,17 +44,37 @@ void get_dmesg_buffer(void)
{
char *dmesg;
char *c1, *c2;
- int linecount = 0;
-- dmesg = malloc(DMESG_SIZE);
+ int linecount = 0, ret;
-+ dmesg = malloc(DMESG_SIZE);
+ dmesg = malloc(DMESG_SIZE);
assert(dmesg!=NULL);
+ c1 = malloc(4096);
+ assert(dmesg!=NULL && c1!=NULL);
-- system("/bin/dmesg -s 256000 > /tmp/boot_dmesg");
+ system("/bin/dmesg -s 256000 > "DMESG_FILE);
+ FILE *f_dmesg;
/* don't printk to the console; newt hates that */
@@ -54,7 +47,7 @@
/* Add to our resource list that we keep. The user
* will have access to this when they look at the
-@@ -90,43 +110,29 @@ void get_dmesg_buffer(void)
+@@ -62,32 +82,22 @@ void get_dmesg_buffer(void)
* see uri.c for implementation */
announce_resource("dmesg://", dmesg, NULL);
@@ -95,51 +88,9 @@
+ linecount ++;
+ }
}
--
+
+ fclose(f_dmesg);
+ free(c1);
-+ free(dmesg);
-+
- /* send boot_dmesg off to extract useful info */
- g_list_foreach(boot_dmesg, check_this_line, NULL);
--
-- free(dmesg);
- e820_register_resource();
--
- }
-
+ free(dmesg);
--
--
- void match_dmesg_string(char *line, char *suggested_uri)
- {
- char dmesg_uri[1024];
-Index: firmwarekit/libstandalone.c
-===================================================================
---- firmwarekit.orig/libstandalone.c
-+++ firmwarekit/libstandalone.c
-@@ -36,17 +36,22 @@ GList *boot_dmesg = NULL;
- static void local_get_dmesg_buffer(void)
- {
- char line [4096];
-+ char *tmp;
- FILE *file;
-
- memset(line, 0, 4096);
-
-- file = fopen("/tmp/boot_dmesg", "r");
-+ file = fopen("/var/log/boot.msg", "r");
- if (!file)
- return;
- while (!feof(file)) {
- if (fgets(line, 4095, file)==NULL)
- break;
-- boot_dmesg = g_list_append(boot_dmesg, strdup(line));
-+ /* only add real kernel messages in <4>msg format */
-+ if (line[0] == '<' && line[2] == '>'){
-+ tmp = &line[3];
-+ boot_dmesg = g_list_append(boot_dmesg, strdup(line));
-+ }
- }
- fclose(file);
}
++++++ ebda_cleanup.patch ++++++
Index: firmwarekit/ebda/Makefile
===================================================================
--- firmwarekit.orig/ebda/Makefile
+++ firmwarekit/ebda/Makefile
@@ -1,4 +1,4 @@
-override CFLAGS = `pkg-config --cflags glib-2.0` -I..
+override CFLAGS += `pkg-config --cflags glib-2.0` -I.. -fPIC
LDFLAGS = `pkg-config --libs glib-2.0`
++++++ fan_cleanup.patch ++++++
Index: firmwarekit/fan/fan.c
===================================================================
--- firmwarekit.orig/fan/fan.c
+++ firmwarekit/fan/fan.c
@@ -42,7 +42,6 @@ static void do_fan(char *dir, char *name
{
FILE *file;
char path[PATH_MAX]; /* fan's directory */
- char uri[1024];
char buffer[4096]; /* holds contents of fan's 'state' file */
char *state = NULL; /* current state of the fan */
++++++ firmwarekit-r1.102.tar.bz2 -> firmwarekit-2.tar.bz2 ++++++
++++ 9286 lines of diff (skipped)
++++++ libstandalone_soname.patch ++++++
Index: firmwarekit/Makefile
===================================================================
--- firmwarekit.orig/Makefile
+++ firmwarekit/Makefile
@@ -33,7 +33,7 @@ biostest: $(LIBS) biostest.h .depend
# cd initramfs ; sh create_initramfs.sh
libstandalone.so: $(LIBS) biostest.h .depend libstandalone.o
- gcc --shared libstandalone.o lib.o -o libstandalone.so
+ gcc --shared libstandalone.o lib.o -Wl,-soname=libstandalone.so -o libstandalone.so
clean:
rm -f biostest
++++++ maxreadreq_cleanup.patch ++++++
Index: firmwarekit/maxreadreq/maxreadreq.c
===================================================================
--- firmwarekit.orig/maxreadreq/maxreadreq.c
+++ firmwarekit/maxreadreq/maxreadreq.c
@@ -91,7 +91,15 @@ int main(int argc, char **argv)
break;
if (line[0]!=' ' && line[0] != '\t' && strlen(line)>8) {
- sprintf(current_device, "pci://00:%s", line, 511);
+ if (strlen(line) > 500){
+ report_result("maxreadreq", WARN, "Too big pci"
+ "string would overflow"
+ "current_device buffer",
+ "Internal plugin, not a firmware"
+ " bug", current_device);
+ break;
+ }
+ sprintf(current_device, "pci://00:%s", line);
current_device[16] = 0;
strncpy(current_type, line+8, 511);
c = strchr(current_type, ':');
++++++ own_params.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200
@@ -6,17 +6,7 @@
===================================================================
--- firmwarekit.orig/main.c
+++ firmwarekit/main.c
-@@ -37,6 +37,9 @@ int use_serial;
- static unsigned long serial_speed;
- static int tty;
-
-+static int do_not_block;
-+char ssh_dest[MAX_SSH_DEST_LEN] = "";
-+
- int safe_mode;
- int interactive_mode = 1;
-
-@@ -84,6 +87,32 @@ static void parse_kernel_param(const cha
+@@ -76,6 +76,16 @@ static void parse_kernel_param(const cha
use_serial=1;
}
@@ -24,33 +14,17 @@
+ if (strstr(buffer, "install=exec:run_biostest")){
+ }
+
-+ if (strstr(buffer, "ssh_save=")){
-+ ret = strlen(buffer) - strlen("ssh_save=") + 1;
-+ if (ret > MAX_SSH_DEST_LEN){
-+ fprintf(stderr, "FATAL: ssh destination string to"
-+ " long (%d > %d). Parameter ignored.\n",
-+ ret, MAX_SSH_DEST_LEN);
-+ }
-+ else{
-+ ret = sscanf(buffer, "ssh_save=%s", ssh_dest);
-+ fprintf(stdout, "ssh destination string set to: %s\n",
-+ ssh_dest);
-+ }
-+ }
-+ if (strstr(buffer, "do_not_block"))
-+ do_not_block=1;
-+
+ if (strstr(buffer, "-h") || strstr(buffer, "--help")){
-+ fprintf(stdout, "biostest [ -h ] [ safemode ] [ noninteractive ] [ do_not_block ]"
-+ " [ ssh_save=host:/dest ]\n");
++ fprintf(stdout, "biostest [ -h ] [ safemode ] [ noninteractive ]"
++ " [ saveovernet=host:/dest ]\n");
+ exit(EXIT_SUCCESS);
+ }
+
/* parse safemode boot param */
if (strstr(buffer, "safemode"))
safe_mode=1;
-@@ -174,8 +203,9 @@ int main(int argc, char **argv)
- * serial. This can also be set by fucn()
+@@ -173,8 +183,9 @@ int main(int argc, char **argv)
+ * serial. This can also be set by func()
* parse_kernel_param if it's in the kernel
* cmdline options */
- if (argc>1 && strstr(argv[1],"serial"))
++++++ path_environment.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200
@@ -14,7 +14,7 @@
int use_serial;
static unsigned long serial_speed;
-@@ -194,6 +195,26 @@ static void parse_kernel_cmdline(void)
+@@ -173,6 +174,26 @@ static void parse_kernel_cmdline(void)
}
}
@@ -24,7 +24,7 @@
+ char new_path_env[8192];
+ path_env = getenv("PATH");
+ ret = snprintf(new_path_env, 8192, "PATH=%s:"
-+ "/usr/share/firmwarekit/bin", path_env);
++ "/usr/lib/firmwarekit/bin", path_env);
+ if (ret >= 8192){
+ fprintf(stderr, "FATAL: PATH environment variable too big,"
+ " increase string array -> that's a bug\n");
@@ -41,9 +41,9 @@
int main(int argc, char **argv)
{
int ret;
-@@ -226,6 +247,8 @@ int main(int argc, char **argv)
- * (implemented in dmesg.c) */
- get_dmesg_buffer();
+@@ -207,6 +228,8 @@ int main(int argc, char **argv)
+ /* register e820 resource */
+ e820_register_resource();
+ set_path_env();
+
++++++ rip_out_unneeded_stuff.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200
@@ -20,30 +20,34 @@
===================================================================
--- firmwarekit.orig/Makefile
+++ firmwarekit/Makefile
-@@ -4,15 +4,15 @@ override CFLAGS += `pkg-config --cflags
+@@ -3,16 +3,18 @@ override CFLAGS += `pkg-config --cflags
+ #LDFLAGS = -nodefaultlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang
LDFLAGS = -nostdlibs -Linitramfs/data/lib -Linitramfs/data/usr/lib -export-dynamic -lc -ldl `pkg-config --libs glib-2.0` -lnewt -lslang
-
--SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq
-+SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq
- LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o
+-
+-SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg lmbench mtrr shelltools fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN
++# Rip out lmbench, our package is in no good shape...
++# Rip out ethernet, this might mess up network in a running system and needs more SUSE adjustance...
++SUBDIRS = acpiinfo pciresource acpicompile cpufreq edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq virt ebda SUN
+ LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o dsdt.o e820.o ssh.o
all: libstandalone.so biostest subdirs
# if arch is i*86 (i386, i686, etc.)
-ifeq ($(shell uname -m | cut -c1,3,4), i86)
-LIBC = initramfs/data/usr/lib/libc.so
--endif
+-else
+#ifeq ($(shell uname -m | cut -c1,3,4), i86)
+#LIBC = initramfs/data/usr/lib/libc.so
-+#endif
++#else
++ifeq ($(shell uname -m), ia64)
+ SUBDIRS += ia64_mce_inject
+ endif
- .PHONY: subdirs $(SUBDIRS)
+@@ -22,13 +24,13 @@ subdirs: $(SUBDIRS)
-@@ -21,13 +21,13 @@ subdirs: $(SUBDIRS)
$(SUBDIRS):
$(MAKE) -C $@
- cd shelltests ; make install
- cd initramfs/kernel ; make
+# cd initramfs/kernel ; make
++++++ scp_save_results.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200
@@ -2,207 +2,15 @@
Makefile | 2
biostest.h | 10 +++-
main.c | 37 ++++++++++++++-
- ssh.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests.c | 7 ++
ui.c | 35 ++++++++++----
6 files changed, 228 insertions(+), 13 deletions(-)
-Index: firmwarekit/ssh.c
-===================================================================
---- /dev/null
-+++ firmwarekit/ssh.c
-@@ -0,0 +1,150 @@
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <time.h>
-+
-+#include <newt.h>
-+
-+#include "biostest.h"
-+
-+#define MAX_SSH_COMMAND_LEN MAX_SSH_DEST_LEN + 512 + HOST_NAME_MAX
-+
-+void setup_result_dir(char *result_dir, size_t string_sz){
-+
-+ char host_name[HOST_NAME_MAX + 1];
-+ int ret;
-+
-+ char date_str[128];
-+ const time_t cur_time = time(NULL);
-+
-+ struct tm *loc_time = localtime(&cur_time);
-+
-+ if (loc_time == NULL)
-+ strcpy (date_str, "");
-+ else
-+ sprintf(date_str, "%.2d%.2d%.2d%.2d%.2d", loc_time->tm_hour,
-+ loc_time->tm_min, loc_time->tm_mday, loc_time->tm_mon + 1,
-+ loc_time->tm_year % 100);
-+
-+ ret = gethostname(host_name, HOST_NAME_MAX);
-+ host_name[HOST_NAME_MAX] = '\0';
-+
-+ /* gethostname may return "(none)" and no error return value in
-+ some cases? There might be other invalid fs character used as host
-+ name? I don't care for that now...
-+ -> handle it
-+ */
-+ if (ret || strstr(host_name, "(") || strstr(host_name, ")")){
-+ snprintf(result_dir, string_sz-1, "results_%s", date_str);
-+ result_dir[string_sz-1] = '\n';
-+ }
-+ else{
-+ snprintf(result_dir, string_sz-1, "results_%s_%s", host_name, date_str);
-+ result_dir[string_sz-1] = '\n';
-+ }
-+ return;
-+}
-+
-+int copy_via_ssh(const char *dest, int verbose)
-+{
-+ char command[4096];
-+ char result_dir[1024];
-+ int ret1, ret2;
-+ setup_result_dir(result_dir, 1024);
-+
-+ /* Check and create tmp dir */
-+ snprintf (command, 4095, "/var/log/firmwarekit/%s", result_dir);
-+ if (access(command, W_OK)){
-+ ret1 = snprintf (command, 4095, "mkdir /var/log/firmwarekit/%s",
-+ result_dir);
-+ ret2 = system(command);
-+ if (ret1 >= 4096 || ret2)
-+ goto error;
-+ }
-+
-+ /* Copy results into tmp dir */
-+ ret1 = snprintf (command, 4096, "cp /var/log/firmwarekit/{results.css,"
-+ "results.xml,resources.css,resources.xml,hwinfo.txt}"
-+ " /var/log/firmwarekit/%s", result_dir);
-+
-+ ret2 = system(command);
-+ if (ret1 >= 4096 || ret2)
-+ goto error;
-+
-+ /* secure copy stuff away */
-+ if (verbose){
-+ ret1 = snprintf (command, 4096, "scp -v -r -o CheckHostIP=no -o "
-+ "StrictHostKeyChecking=no /var/log/firmwarekit/%s"
-+ " %s", result_dir, dest);
-+ }
-+ else{
-+ ret1 = snprintf (command, 4096, "scp -r -o CheckHostIP=no -o "
-+ "StrictHostKeyChecking=no /var/log/firmwarekit/%s"
-+ " %s &>/dev/null", result_dir, dest);
-+ }
-+
-+ ret2 = system(command);
-+ if (ret1 >= 4096 || ret2)
-+ goto error;
-+ return 0;
-+ error:
-+ fprintf (stderr, "WARN: ssh copying did not succeed. ret1: %d, "
-+ "ret2: %d\n", ret1, ret2);
-+ return 1;
-+}
-+
-+void save_via_ssh(void)
-+{
-+ int myWin;
-+ newtComponent myForm;
-+
-+ newtComponent mySave, myBack, mySCPDest, resu;
-+
-+ const char *destination;
-+ int ret;
-+
-+ int W,H;
-+
-+ newtGetScreenSize(&W,&H);
-+
-+ myWin = newtOpenWindow(1+(W-80)/2,1+(H-10)/2,80,10, "Provide"
-+ "destination where to copy results"
-+ " in scp syntax");
-+ myForm = newtForm(NULL,NULL,0);
-+
-+ newtFormAddComponent(myForm, newtLabel(2,2, "Destination"));
-+ /* ssh_dest may got passed via ssh_save= param */
-+ if (ssh_dest[0] != '\0')
-+ mySCPDest = newtEntry(15, 2, "host:/target_dir",
-+ MAX_SSH_DEST_LEN, &destination, 0);
-+ else
-+ mySCPDest = newtEntry(15, 2, ssh_dest,
-+ MAX_SSH_DEST_LEN, &destination, 0);
-+
-+ newtFormAddComponent(myForm, mySCPDest);
-+
-+/* Password passing is not possible via scp...
-+ mySCPDest = newtEntry(20, 4, "host:/target_dir", 20, &pass, NEWT_FLAG_HIDDEN);
-+ newtFormAddComponent(myForm, mySCPDest);
-+*/
-+ mySave = newtButton(2, 4, "Save");
-+ newtFormAddComponent(myForm, mySave);
-+
-+ myBack = newtButton(27, 4, "Back");
-+ newtFormAddComponent(myForm, myBack);
-+
-+ resu = newtRunForm(myForm);
-+ if (resu == mySave) {
-+ newtCls();
-+ ret = copy_via_ssh(destination, 0);
-+ if (ret)
-+ simple_ok_dialog("SCP result", "ERROR: scp command did"
-+ " not succeed");
-+ else
-+ simple_ok_dialog("SCP result", "Copying data was "
-+ "successfull");
-+ }
-+ newtPopWindow();
-+}
-Index: firmwarekit/biostest.h
-===================================================================
---- firmwarekit.orig/biostest.h
-+++ firmwarekit/biostest.h
-@@ -82,7 +82,8 @@ extern void check_dmesg_updates(char *ur
-
- /* tests.c */
-
--extern void dump_results(void);
-+extern void dump_xml_results(void);
-+extern void show_results(void);
- extern void sort_results(void);
-
- extern void register_interactive_test(char *name, voidvoidfunc *func);
-@@ -116,6 +117,13 @@ extern void dump_xml(GList *all_tests, c
- /* usb.c */
- extern void save_on_usb(void);
-
-+/* ssh.c */
-+#define MAX_SSH_DEST_LEN 64
-+
-+extern void save_via_ssh(void);
-+extern int copy_via_ssh(const char *dest, int verbose);
-+extern char ssh_dest[MAX_SSH_DEST_LEN];
-+
- /* serial.c */
-
- extern void init_serial(int enable, int tty, unsigned long speed);
Index: firmwarekit/main.c
===================================================================
--- firmwarekit.orig/main.c
+++ firmwarekit/main.c
-@@ -27,6 +27,7 @@
-
-
- #include <slang.h>
-+#include <newt.h>
-
- #include <glib.h>
-
-@@ -195,6 +196,7 @@ static void parse_kernel_cmdline(void)
+@@ -175,6 +175,7 @@ static void parse_kernel_cmdline(void)
int main(int argc, char **argv)
{
@@ -210,7 +18,7 @@
/* initialisation of core support routines */
parse_kernel_cmdline();
-@@ -211,6 +213,12 @@ int main(int argc, char **argv)
+@@ -191,6 +192,11 @@ int main(int argc, char **argv)
* (implemented in serial.c) */
init_serial(use_serial, tty, serial_speed);
@@ -219,160 +27,6 @@
+ if (ret)
+ fprintf (stderr, "hwinfo did not succeed\n");
+
-+
- /* obtain dsdt and ssdt acpi tables in binary format */
- extract_dsdt_ssdts();
-
-@@ -228,7 +236,34 @@ int main(int argc, char **argv)
-
- finished_tests = 1;
-
-- dump_results();
-+ int ssh_ret;
-+ if (do_not_block){
-+ dump_xml_results();
-+ newtRefresh();
-+ newtPopWindow();
-+ newtFinished();
-+
-+ if (ssh_dest[0] != '\0'){
-+ /* be more verbose in non_blocking mode,
-+ windows do not matter, possiblity to track down
-+ why secure copy might not work */
-+ ssh_ret = copy_via_ssh(ssh_dest, 1);
-+ if (ssh_ret){
-+ /* print out error after newt stuff finished.*/
-+ fprintf(stderr, "ERROR: scp copy to %s did"
-+ " not succeed\n", ssh_dest);
-+ return EXIT_FAILURE;
-+ }
-+ else{
-+ fprintf(stdout, "Copying data to %s "
-+ "successfull\n", ssh_dest);
-+ }
-+ }
-+ }
-+ else{
-+ dump_xml_results();
-+ show_results();
-+ }
-
- return EXIT_SUCCESS;
- }
-Index: firmwarekit/ui.c
-===================================================================
---- firmwarekit.orig/ui.c
-+++ firmwarekit/ui.c
-@@ -34,6 +34,19 @@
- static int myProgressWin=-1;
- static newtComponent myProgressText, myProgressForm, myScales;
-
-+static GList *save_pokes;
-+
-+static void register_save_poke(char *name, voidvoidfunc *func)
-+{
-+ struct interactive_test *test;
-+ test = malloc(sizeof(struct interactive_test));
-+ assert(test!=NULL);
-+ memset(test, 0, sizeof(struct interactive_test));
-+ test->shortname = strdup(name);
-+ test->execute = func;
-+ save_pokes = g_list_append(save_pokes, test);
-+}
-+
- static int longest_string(char *str)
- {
- char *c;
-@@ -501,6 +514,7 @@ static void int_poke_dialog(char *title,
- }
-
- newtPopWindow();
-+ newtFormDestroy(myForm);
- }
-
- static int nrtotal, nrpass, nrfail, nrwarn;
-@@ -623,7 +637,7 @@ void show_results_ui(GList *all_tests)
- int win;
- newtComponent myForm;
- newtComponent myOkButton;
-- newtComponent myUSBButton;
-+ newtComponent mySaveButton;
- newtComponent myIntButton;
- newtComponent myPokeButton;
- newtComponent myHelpButton;
-@@ -662,18 +676,23 @@ void show_results_ui(GList *all_tests)
- myOkButton = newtButton(2,H-8, "Exit");
- newtFormAddComponent(myForm, myOkButton);
-
-- myUSBButton = newtButton(12,H-8, "Save to USB");
-- newtFormAddComponent(myForm, myUSBButton);
-+ mySaveButton = newtButton(12,H-8, "Save");
-+ newtFormAddComponent(myForm, mySaveButton);
-+
-+ /* Setup save options */
-+
-+ register_save_poke("Save to USB", save_on_usb);
-+ register_save_poke("Save via SSH", save_via_ssh);
-
-- myIntButton = newtButton(29,H-8, "Manual Tests");
-+ myIntButton = newtButton(22,H-8, "Manual Tests");
- if (interactive_tests)
- newtFormAddComponent(myForm, myIntButton);
-
-- myPokeButton = newtButton(47,H-8, "Poke HW");
-+ myPokeButton = newtButton(40,H-8, "Poke HW");
- if (hardware_pokes)
- newtFormAddComponent(myForm, myPokeButton);
-
-- myHelpButton = newtButton(61,H-8, "Help");
-+ myHelpButton = newtButton(54,H-8, "Help");
- newtFormAddComponent(myForm, myHelpButton);
-
- if (!interactive_mode) {
-@@ -688,8 +707,8 @@ void show_results_ui(GList *all_tests)
- show_resource_info(result->devuri);
- else
- show_result(result);
-- } else if (resu == myUSBButton) {
-- save_on_usb();
-+ } else if (resu == mySaveButton) {
-+ int_poke_dialog("Save results", save_pokes);
- } else if (resu == myPokeButton) {
- int_poke_dialog("Poke hardware", hardware_pokes);
- } else if (resu == myIntButton) {
-Index: firmwarekit/tests.c
-===================================================================
---- firmwarekit.orig/tests.c
-+++ firmwarekit/tests.c
-@@ -197,13 +197,16 @@ void sort_results(void)
- }
-
-
--void dump_results(void)
-+void dump_xml_results(void)
- {
- dump_xml(all_tests, "/var/log/firmwarekit/results.xml");
- dump_xml_resources("/var/log/firmwarekit/resources.xml");
-- show_results_ui(all_tests);
- }
-
-+void show_results(void)
-+{
-+ show_results_ui(all_tests);
-+}
-
- void register_hw_poke(char *name, voidvoidfunc *func)
- {
-Index: firmwarekit/Makefile
-===================================================================
---- firmwarekit.orig/Makefile
-+++ firmwarekit/Makefile
-@@ -5,7 +5,7 @@ LDFLAGS = -nostdlibs -Linitramfs/data/li
-
-
- SUBDIRS = acpiinfo pciresource acpicompile cpufreq ethernet edd battery msrpoke pcipoke usbports tonetest bashshell mcfg mtrr shelltools shelltests fan fadt chk_hpet suspend thermal_trip microcode dmi os2gap apicedge maxreadreq
--LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o
-+LIBS = dmesg.o main.o tests.o plugins.o ui.o uri.o dumpxml.o usb.o serial.o lib.o acpitable.o e820.o ssh.o
-
- all: libstandalone.so biostest subdirs
-
+ /* get and parse demsg for useful info
+ * (implemented in dmesg.c) */
+ get_dmesg_buffer();
++++++ suspend_cleanup.patch ++++++
Index: firmwarekit/suspend/suspend.c
===================================================================
--- firmwarekit.orig/suspend/suspend.c
+++ firmwarekit/suspend/suspend.c
@@ -30,19 +30,9 @@
static void do_test(void)
{
- FILE *file;
start_test("suspend", "Suspend/resume testing",
"This test checks if suspend-to-ram works");
-/*
- file = fopen("/sys/power/state", "w");
- if (!file) {
- report_result("suspend", FAIL, "S3 not supported", NULL, NULL);
- return;
- }
- fprintf(file, "mem");
- fclose(file);
-*/
system("/usr/sbin/pm-suspend");
finish_test("suspend");
++++++ use_external_pmtool_bins.patch ++++++
--- /var/tmp/diff_new_pack.n24763/_old 2007-05-31 20:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.n24763/_new 2007-05-31 20:50:15.000000000 +0200
@@ -8,24 +8,52 @@
===================================================================
--- firmwarekit.orig/acpicompile/acpicompile.c
+++ firmwarekit/acpicompile/acpicompile.c
-@@ -339,7 +339,7 @@ static void do_table(char *filename)
- char uri[4096];
- char command[4096];
+@@ -83,10 +83,14 @@ static void do_table(char *filename)
+ int errlineno;
-- sprintf(command, "plugins/iasl -vi -vs -w3 %s", filename);
+ /* Compile the dsdt or ssdt .dsl with iasl */
++/*
+ if (access("plugins", R_OK))
+ sprintf(command, "../plugins/iasl -vi -vs -w3 %s", filename);
+ else
+ sprintf(command, "plugins/iasl -vi -vs -w3 %s", filename);
++*/
++
+ sprintf(command, "/usr/bin/iasl -vi -vs -w3 %s", filename);
+
- file = popen(command,"r");
- while (!feof(file)) {
-@@ -465,19 +465,19 @@ static void do_test(void)
- if (ret != EXIT_SUCCESS)
- return;
+ /* analyse output of the iasl compiler */
+Index: firmwarekit/dsdt.c
+===================================================================
+--- firmwarekit.orig/dsdt.c
++++ firmwarekit/dsdt.c
+@@ -55,13 +55,13 @@ void extract_dsdt_ssdts()
+ int ret;
+
+ /* create hex-dump format of all acpi tables in file 'acpidump' */
+- system("plugins/acpidump > acpi.dump &> /dev/null");
++ system("/usr/sbin/acpidump > acpi.dump 2> /dev/null");
+ if (access("acpi.dump", R_OK))
+ fprintf(stderr,"WARN (acpidump): failed to create acpi.dump.\n");
+
+ /* use 'acpidump' file to extract dsdt and ssdt tables
+ * in binary format, creates DSDT.dat and SSDT*.dat */
+- system("plugins/acpixtract acpi.dump &> /dev/null");
++ system("/usr/bin/acpixtract acpi.dump &> /dev/null");
+ if (access("DSDT.dat", R_OK)) {
+ ret = system("cat /proc/acpi/dsdt > DSDT.dat");
+ if (ret != EXIT_SUCCESS) {
+@@ -71,21 +71,21 @@ void extract_dsdt_ssdts()
}
-- ret = system("plugins/iasl -d DSDT.dat &>/dev/null");
-+ ret = system("/usr/bin/iasl -d DSDT.dat &>/dev/null");
- if (ret)
- printf("iasl returns %i \n", ret);
+ /* Disassemble DSDT.dat with iasl, will create DSDT.dsl */
+- system("plugins/iasl -d DSDT.dat &>/dev/null");
++ system("/usr/bin/iasl -d DSDT.dat &>/dev/null");
+ if (access("DSDT.dsl", R_OK))
+ fprintf(stderr,"WARN (iasl): failed to create DSDT.dsl.\n");
+
+ /* Include ACPI table for external symbol resolution (if they exist) */
+- system("plugins/iasl -d -e DSDT.dat SSDT.dat &>/dev/null");
- system("plugins/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null");
- system("plugins/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null");
- system("plugins/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null");
@@ -35,6 +63,7 @@
- system("plugins/iasl -d -e DSDT.dat SSDT7.dat &>/dev/null");
- system("plugins/iasl -d -e DSDT.dat SSDT8.dat &>/dev/null");
- system("plugins/iasl -d -e DSDT.dat SSDT9.dat &>/dev/null");
++ system("/usr/bin/iasl -d -e DSDT.dat SSDT.dat &>/dev/null");
+ system("/usr/bin/iasl -d -e DSDT.dat SSDT1.dat &>/dev/null");
+ system("/usr/bin/iasl -d -e DSDT.dat SSDT2.dat &>/dev/null");
+ system("/usr/bin/iasl -d -e DSDT.dat SSDT3.dat &>/dev/null");
@@ -47,34 +76,3 @@
/* current iasl has an issue with arugment counts in SSDT's, work around this */
system("sed -i -e \"s/^ACPI Error.*Argument count mismatch for method.*//g\" SSDT*.dsl &> /dev/null");
-Index: firmwarekit/main.c
-===================================================================
---- firmwarekit.orig/main.c
-+++ firmwarekit/main.c
-@@ -50,11 +50,11 @@ int finished_tests = 0;
- static void extract_dsdt_ssdts()
- {
- /* create hex-dump format of all acpi tables in file 'acpidump' */
-- system("plugins/acpidump > acpidump &> /dev/null");
-+ system("/usr/sbin/acpidump > acpidump &> /dev/null");
-
- /* use 'acpidump' file to extract dsdt and ssdt tables
- * in binary format, creates DSDT.dat and SSDT.dat */
-- system("plugins/acpixtract acpidump &> /dev/null");
-+ system("/usr/bin/acpixtract acpidump &> /dev/null");
- }
-
- /* Parse the kernel parameter we got from func() parse_kernel_cmdline.
-Index: firmwarekit/chk_hpet/chk_hpet.c
-===================================================================
---- firmwarekit.orig/chk_hpet/chk_hpet.c
-+++ firmwarekit/chk_hpet/chk_hpet.c
-@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
- ret = system("cat /proc/acpi/dsdt > DSDT.dat");
- if (ret != EXIT_SUCCESS)
- return ret;
-- ret = system("plugins/iasl -d DSDT.dat &>/dev/null");
-+ ret = system("/usr/bin/iasl -d DSDT.dat &>/dev/null");
- if (ret)
- printf("iasl returns %i \n", ret);
- report_testrun_progress(30);
++++++ virt_cleanup.patch ++++++
Index: firmwarekit/virt/virt.c
===================================================================
--- firmwarekit.orig/virt/virt.c
+++ firmwarekit/virt/virt.c
@@ -101,7 +101,6 @@ static int vt_locked_by_bios(void)
int main(int argc, char **argv)
{
- FILE *file;
start_test("virt", "VT/VMX Virtualization extensions",
"This test checks if VT/VMX is set up correctly");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package emacs-w3
checked in at Thu May 31 20:49:39 CEST 2007.
--------
--- emacs-w3/emacs-w3.changes 2006-09-19 19:26:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs-w3/emacs-w3.changes 2007-05-30 11:53:35.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 30 11:46:53 CEST 2007 - schwab(a)suse.de
+
+- The url package is now part of emacs.
+- Fix spurious executable bits.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs-w3-cvs.spec ++++++
--- /var/tmp/diff_new_pack.L21630/_old 2007-05-31 20:48:58.000000000 +0200
+++ /var/tmp/diff_new_pack.L21630/_new 2007-05-31 20:48:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package emacs-w3 (Version cvs)
#
-# 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.
#
@@ -11,17 +11,17 @@
# norootforbuild
Name: emacs-w3
-BuildRequires: emacs-nox emacs-url
+BuildRequires: emacs-nox
%define short_name w3
-License: Other License(s), see package
+License: GNU General Public License (GPL)
Group: Productivity/Editors/Emacs
Provides: w3 emacs_w3
Obsoletes: emacs_w3
-Requires: emacs emacs-url
+Requires: emacs
Autoreqprov: on
Summary: Emacs/W3--a WWW Browser for Emacs
Version: cvs
-Release: 590
+Release: 637
# Original source: ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/w3-4.0pre.46.tar.gz
#+ Source: ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/w3-%{version}.tar.bz2
# CVS: :pserver:anoncvs@subversions.gnu.org:/cvs
@@ -94,9 +94,7 @@
'(princ (format "%s.%s" emacs-major-version emacs-minor-version)))')
./configure --prefix=%{_prefix} --infodir=%{_infodir} \
--with-lispdir=%{_prefix}/share/emacs/site-lisp/%{short_name} \
- --datadir=%{_prefix}/share/emacs/%{short_name} \
- --with-gnus=%{_prefix}/share/emacs/$EMACS_VERSION/lisp/gnus \
- --with-url=%{_prefix}/share/emacs/site-lisp/url
+ --datadir=%{_prefix}/share/emacs/%{short_name}
rm -f lisp/*elc
make
@@ -127,7 +125,10 @@
%{_infodir}/%{short_name}*
%{_prefix}/share/emacs/%{short_name}
-%changelog -n emacs-w3
+%changelog
+* Wed May 30 2007 - schwab(a)suse.de
+- The url package is now part of emacs.
+- Fix spurious executable bits.
* Tue Sep 19 2006 - schwab(a)suse.de
- Handle new url-retrieve callback interface in Emacs 22.
* Wed Jan 25 2006 - mls(a)suse.de
++++++ emacs_w3.dif ++++++
--- /var/tmp/diff_new_pack.L21630/_old 2007-05-31 20:48:58.000000000 +0200
+++ /var/tmp/diff_new_pack.L21630/_new 2007-05-31 20:48:58.000000000 +0200
@@ -1,8 +1,60 @@
---- w3-4.0pre.44/dot.emacs Thu Mar 5 00:46:33 1998
-+++ w3-4.0pre.44/dot.emacs Tue Jul 14 13:15:56 1998
+--- w3/dot.emacs
++++ w3/dot.emacs
@@ -0,0 +1,5 @@
+
+;;; Emacs/W3 Configuration
-+(setq load-path (cons "/usr/share/emacs/site-lisp/w3" load-path))
-+(require 'w3-auto "w3-auto")
++(add-to-list 'load-path "/usr/share/emacs/site-lisp/w3")
++(require 'w3-auto)
+
+--- w3/etc/Makefile.in
++++ w3/etc/Makefile.in
+@@ -5,6 +5,7 @@
+
+ EMACS = @EMACS@
+ INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
+ RM = rm -f
+
+ TARGETS = default.css
+@@ -15,9 +16,9 @@
+ ( if [ ! -d $(datadir) ]; then mkdir -p $(datadir); fi )
+ for x in $(TARGETS); do \
+ if [ -f $$x ]; then \
+- $(INSTALL) $$x $(datadir); \
++ $(INSTALL_DATA) $$x $(datadir); \
+ else \
+- $(INSTALL) $(srcdir)/$$x $(datadir); \
++ $(INSTALL_DATA) $(srcdir)/$$x $(datadir); \
+ fi \
+ done
+
+--- w3/lisp/Makefile.in
++++ w3/lisp/Makefile.in
+@@ -17,7 +17,7 @@
+ INSTALL = @INSTALL@
+ RM = rm -f
+
+-DEPS = -l $(srcdir)/docomp.el -l $(URLDIR)/url-vars.el -l $(srcdir)/w3-vars.el
++DEPS = -l $(srcdir)/docomp.el -l url-vars -l $(srcdir)/w3-vars.el
+
+ # compile with noninteractive and relatively clean environment
+ BATCHFLAGS = -batch -q -no-site-file
+--- w3/texi/Makefile.in
++++ w3/texi/Makefile.in
+@@ -6,6 +6,7 @@
+ VPATH = $(srcdir)
+ EMACS = @EMACS@
+ INSTALL = @INSTALL@
++INSTALL_DATA = @INSTALL_DATA@
+ RM = rm -f
+ MAKEINFO = @MAKEINFO@
+ TEXI2HTML = @TEXI2HTML@
+@@ -40,7 +41,7 @@
+
+ install:
+ ( if [ ! -d $(infodir) ]; then mkdir -p $(infodir); fi )
+- for x in *.info*; do $(INSTALL) $$x $(infodir); done
++ for x in *.info*; do $(INSTALL_DATA) $$x $(infodir); done
+ -for x in *.info; do $(INSTALLINFO) $$x $(infodir)/dir; done
+
+ distclean: clean
++++++ suse-start-w3.el ++++++
--- emacs-w3/suse-start-w3.el 2003-02-18 20:14:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/emacs-w3/suse-start-w3.el 2007-05-30 11:53:18.000000000 +0200
@@ -1,7 +1,7 @@
;; /usr/share/emacs/site-lisp/suse-start-w3.el
(add-to-list 'load-path "/usr/share/emacs/site-lisp/w3")
-(require 'w3-auto "w3-auto")
+(require 'w3-auto)
;; /usr/share/emacs/site-lisp/suse-start-w3.el ends here
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dbxml
checked in at Thu May 31 20:48:51 CEST 2007.
--------
--- dbxml/dbxml.changes 2007-01-17 08:46:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/dbxml/dbxml.changes 2007-05-30 09:50:29.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 30 09:49:45 CEST 2007 - dbornkessel(a)suse.de
+
+- added patch for avoiding literal string comparison
+
+-------------------------------------------------------------------
New:
----
comparison.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbxml.spec ++++++
--- /var/tmp/diff_new_pack.A19158/_old 2007-05-31 20:48:18.000000000 +0200
+++ /var/tmp/diff_new_pack.A19158/_new 2007-05-31 20:48:18.000000000 +0200
@@ -21,7 +21,7 @@
%define xerces_cvs_version 2_7_0
Summary: Berkeley DB XML
Version: 2.2.13.patch4
-Release: 30
+Release: 57
Source0: dbxml-%{dbxml_version}.tar.bz2
Source1: db-%{db_version}.tar.bz2
Source2: xerces-c-src_%{xerces_cvs_version}.tar.bz2
@@ -32,6 +32,7 @@
Patch2: %{name}-%{dbxml_version}-uninitialized-variables.patch
Patch3: %{name}-%{dbxml_version}-official-patches.patch
Patch4: %{name}-%{dbxml_version}-rpath.patch
+Patch5: comparison.patch
Patch150: java150_build.patch
# db patches
Patch100: db-%{db_version}.dif
@@ -43,7 +44,7 @@
#libpathan patches
#Patch300: libpathan-1.2-conf.patch
URL: http://www.sleepycat.com/products/xml.shtml
-License: BSD License and BSD-like
+License: BSD License and BSD-like, no advertise-clause. no name-useage-clause.
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libpathan = %{pathan_version}
@@ -106,9 +107,9 @@
%package -n db43-java
Summary: Java Bindings for the Berkeley DB
Version: 4.3.29
-Release: 14
+Release: 41
URL: http://www.sleepycat.com/products/xml.shtml
-License: BSD License and BSD-like
+License: BSD License and BSD-like, no advertise-clause. no name-useage-clause.
Group: Productivity/Databases/Servers
Requires: db43 = %{db_version}
Requires: glibc-devel
@@ -131,7 +132,7 @@
%package -n libpathan
Summary: Pathan Provides an XPath Parsing and Evaluation API
Version: 2_2.2.13.dbxml
-Release: 52
+Release: 79
URL: http://software.decisionsoft.com/pathan1Info.html
License: BSD License and BSD-like
Group: Development/Languages/C and C++
@@ -153,7 +154,7 @@
%package -n libpathan-devel
Summary: Include Files and Libraries mandatory for Development
Version: 2_2.2.13.dbxml
-Release: 52
+Release: 79
Group: Development/Languages/C and C++
Requires: Xerces-c-devel >= %{xerces_c_version}
Requires: libpathan = 2_2.2.13.dbxml
@@ -174,7 +175,7 @@
%package -n libxquery
Summary: Library Conforming with XQuery
Version: 1.2.0
-Release: 53
+Release: 80
Url: http://www.sleepycat.com/products/xml.shtml
License: BSD License and BSD-like
Group: Development/Libraries/C and C++
@@ -190,7 +191,7 @@
Summary: Library Conforming with XQuery
Group: Development/Libraries/C and C++
Version: 1.2.0
-Release: 53
+Release: 80
Requires: libpathan-devel >= %{pathan_version}
Requires: libpathan >= %{pathan_version}
Requires: Xerces-c-devel >= %{xerces_c_version}
@@ -213,6 +214,7 @@
%patch1
%patch2
%patch4
+%patch5 -p1
# go to db directory and apply patch
pushd db-%{db_version}
%patch100
@@ -638,7 +640,9 @@
#<<< changelog
# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:
-%changelog -n dbxml
+%changelog
+* Wed May 30 2007 - dbornkessel(a)suse.de
+- added patch for avoiding literal string comparison
* Wed Jan 17 2007 - dbornkessel(a)suse.de
- added RPM_OPT_FLAGS
* Mon Nov 20 2006 - pmladek(a)suse.cz
++++++ comparison.patch ++++++
# compiler in beta does not like comparison of string literals
Index: dbxml-2.2.13/pathan/src/utils/XPath2Utils.cpp
===================================================================
--- dbxml-2.2.13.orig/pathan/src/utils/XPath2Utils.cpp
+++ dbxml-2.2.13/pathan/src/utils/XPath2Utils.cpp
@@ -300,7 +300,7 @@ int XPath2Utils::indexNode(const XERCES_
break;
}
default:
- assert("n" == "Unhandled node type in XPath2Utils::indexNode");
+ assert(0 == "Unhandled node type in XPath2Utils::indexNode");
DSLthrow(MiscException,X("XPath2Utils::indexNode"), X("Unhandled node type"));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package classpath
checked in at Thu May 31 20:48:06 CEST 2007.
--------
--- classpath/classpath.changes 2007-05-02 11:54:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/classpath/classpath.changes 2007-05-30 11:38:37.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 30 11:38:17 CEST 2007 - dbornkessel(a)suse.de
+
+- deleted wrong requirements
+- put development files in -devel packages
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ classpath.spec ++++++
--- /var/tmp/diff_new_pack.T17429/_old 2007-05-31 20:47:42.000000000 +0200
+++ /var/tmp/diff_new_pack.T17429/_new 2007-05-31 20:47:42.000000000 +0200
@@ -40,7 +40,7 @@
Group: Development/Libraries/Java
Autoreqprov: on
Version: 0.95
-Release: 6
+Release: 22
Summary: GNU implementation of the essential libraries for Java
URL: http://www.gnu.org/software/classpath/
Source: %{name}-%{version}.tar.bz2
@@ -207,25 +207,6 @@
Summary: GNU implementation of the essential libraries for Java
Group: Development/Libraries/Java
Requires: %{name} = %{version}
-Requires: gtk2
-Requires: gtk2-devel
-Requires: atk-devel
-Requires: pango-devel
-Requires: cairo-devel
-Requires: fontconfig-devel
-Requires: glitz-devel
-Requires: libpng-devel
-Requires: xorg-x11-libXrender-devel
-Requires: xorg-x11-libSM-devel
-Requires: xorg-x11-libICE-devel
-Requires: freetype2-devel
-Requires: expat
-Requires: zlib-devel
-Requires: xorg-x11-libX11-devel
-Requires: xorg-x11-libXau-devel
-Requires: xorg-x11-libXdmcp-devel
-Requires: glib2-devel
-Requires: glibc-devel
%if %suse_version < 1000
Requires: mozilla
%endif
@@ -458,9 +439,9 @@
%doc AUTHORS BUGS COPYING HACKING LICENSE NEWS README THANKYOU TODO
%{_bindir}/*
%_libdir/%{name}
+%exclude %_libdir/%{name}/*.so
%exclude %{_libdir}/%{name}/libgcjwebplugin.*
%exclude %{_libdir}/%{name}/*.la
-%_includedir/*
#%dir %{_javadir}
%{_javadir}/*
%{_datadir}/info/*
@@ -472,6 +453,8 @@
%defattr(-,root,root)
%{_libdir}/%{name}/*.la
%exclude %{_libdir}/%{name}/libgcjwebplugin.la
+%_libdir/%{name}/*.so
+%_includedir/*
%files javadocs
%defattr(-,root,root)
@@ -493,6 +476,9 @@
%{_libdir}/%{name}/libgcjwebplugin.la
%changelog
+* Wed May 30 2007 - dbornkessel(a)suse.de
+- deleted wrong requirements
+- put development files in -devel packages
* Wed May 02 2007 - dbornkessel(a)suse.de
- added unzip to BuildRequires
* Wed Apr 25 2007 - dbornkessel(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package clamav
checked in at Thu May 31 20:47:34 CEST 2007.
--------
--- clamav/clamav.changes 2007-04-13 11:54:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/clamav/clamav.changes 2007-05-31 16:46:29.000000000 +0200
@@ -1,0 +2,12 @@
+Thu May 31 16:45:25 CEST 2007 - max(a)suse.de
+
+- Security update: 0.90.3 (#279536)
+- libclamav/unsp.c: fix end of buffer calculation (bb#464)
+- libclamav/others.c: use strict permissions (0600) for temporary files
+ created in cli_gentempstream() (bb#517).
+- libclamav/unrar/unrar.c: heap corruption causing DoS with corrupted
+ rar archive, better handle truncated files
+- libclamav/phishcheck.c: isURL() regex execution hangs on Solaris
+- libclamav/ole2_extract.c: detect block list loop (bb#466)
+
+-------------------------------------------------------------------
Old:
----
clamav-0.90.2.tar.bz2
New:
----
clamav-0.90.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clamav.spec ++++++
--- /var/tmp/diff_new_pack.I12978/_old 2007-05-31 20:46:31.000000000 +0200
+++ /var/tmp/diff_new_pack.I12978/_new 2007-05-31 20:46:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package clamav (Version 0.90.2)
+# spec file for package clamav (Version 0.90.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
BuildRequires: pwdutils
%endif
Summary: Antivirus Toolkit
-Version: 0.90.2
+Version: 0.90.3
Release: 1
License: GNU General Public License (GPL)
Group: Productivity/Security
@@ -201,6 +201,15 @@
done
%changelog
+* Thu May 31 2007 - max(a)suse.de
+- Security update: 0.90.3 (#279536)
+- libclamav/unsp.c: fix end of buffer calculation (bb#464)
+- libclamav/others.c: use strict permissions (0600) for temporary files
+ created in cli_gentempstream() (bb#517).
+- libclamav/unrar/unrar.c: heap corruption causing DoS with corrupted
+ rar archive, better handle truncated files
+- libclamav/phishcheck.c: isURL() regex execution hangs on Solaris
+- libclamav/ole2_extract.c: detect block list loop (bb#466)
* Fri Apr 13 2007 - max(a)suse.de
- Security update: 0.90.2 (#264189)
- CVE-2007-1997: CAB File Unstore Buffer Overflow Vulnerability
++++++ clamav-0.90.2.tar.bz2 -> clamav-0.90.3.tar.bz2 ++++++
clamav/clamav-0.90.2.tar.bz2 /mounts/work_src_done/STABLE/clamav/clamav-0.90.3.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bluez-libs
checked in at Thu May 31 20:46:05 CEST 2007.
--------
--- bluez-libs/bluez-libs.changes 2007-05-25 12:19:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/bluez-libs/bluez-libs.changes 2007-05-29 14:32:05.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 29 14:31:56 CEST 2007 - dmueller(a)suse.de
+
+- add patch to fix compilation with C++ applications
+
+-------------------------------------------------------------------
New:
----
compound-literals-are-gnu-extension.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-libs.spec ++++++
--- /var/tmp/diff_new_pack.G10894/_old 2007-05-31 20:45:53.000000000 +0200
+++ /var/tmp/diff_new_pack.G10894/_new 2007-05-31 20:45:53.000000000 +0200
@@ -13,12 +13,13 @@
Name: bluez-libs
URL: http://bluez.sourceforge.net
Version: 3.11
-Release: 1
+Release: 3
Summary: Bluetooth Libraries
License: GNU General Public License (GPL)
Group: Hardware/Mobile
Autoreqprov: on
Source: bluez-libs-%{version}.tar.gz
+Patch1: compound-literals-are-gnu-extension.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define prefix /usr
@@ -35,6 +36,7 @@
%prep
%setup -q
+%patch1
%{?suse_update_config:%{suse_update_config -f . }}
%build
@@ -64,6 +66,8 @@
%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
%changelog
+* Tue May 29 2007 - dmueller(a)suse.de
+- add patch to fix compilation with C++ applications
* Fri May 25 2007 - seife(a)suse.de
- update to v3.11:
* Fix URL data size handling.
++++++ compound-literals-are-gnu-extension.diff ++++++
--- include/bluetooth.h
+++ include/bluetooth.h
@@ -105,9 +105,9 @@ typedef struct {
uint8_t b[6];
} __attribute__((packed)) bdaddr_t;
-#define BDADDR_ANY (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
-#define BDADDR_ALL (&(bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}})
-#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
+#define BDADDR_ANY __extension__ (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
+#define BDADDR_ALL __extension__ (&(bdaddr_t) {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}})
+#define BDADDR_LOCAL __extension__ (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
/* Copy, swap, convert BD Address */
static inline int bacmp(const bdaddr_t *ba1, const bdaddr_t *ba2)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package aaa_base
checked in at Thu May 31 20:44:27 CEST 2007.
--------
--- aaa_base/aaa_base.changes 2007-04-25 16:15:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-05-30 21:04:08.561325000 +0200
@@ -1,0 +2,5 @@
+Wed May 30 21:04:56 CEST 2007 - varkoly(a)suse.de
+
+- move sysconfig.mail into yast2-mail
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.md3178/_old 2007-05-31 20:43:55.000000000 +0200
+++ /var/tmp/diff_new_pack.md3178/_new 2007-05-31 20:43:55.000000000 +0200
@@ -19,7 +19,7 @@
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
Autoreqprov: on
Version: 10.3
-Release: 27
+Release: 34
Summary: SUSE Linux Base Package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: aaa_base.tar.bz2
@@ -131,6 +131,8 @@
%defattr(-,root,root)
%changelog
+* Wed May 30 2007 - varkoly(a)suse.de
+- move sysconfig.mail into yast2-mail
* Wed Apr 25 2007 - werner(a)suse.de
- Check for exported PS1 variable (bug #261203)
* Tue Apr 24 2007 - lnussel(a)suse.de
++++++ aaa_base.post ++++++
--- aaa_base/aaa_base.post 2007-04-24 17:21:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.post 2007-05-30 21:03:34.144185000 +0200
@@ -118,7 +118,7 @@
mv etc/rc.config.d/lang.rc.config etc/sysconfig/language
fi
for i in language backup boot kernel \
- suseconfig clock proxy windowmanager sysctl mail \
+ suseconfig clock proxy windowmanager sysctl \
cron news shutdown sw_management ; do
%{fillup_only -n $i}
done
++++++ sysconfig_parts.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.mail new/sysconfig_parts/sysconfig.mail
--- old/sysconfig_parts/sysconfig.mail 2004-05-06 12:15:48.000000000 +0200
+++ new/sysconfig_parts/sysconfig.mail 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-## Path: Network/Mail/General
-## Description:
-## Type: string
-## Default: ""
-## Config: sendmail,postfix
-## ServiceReload: sendmail,postfix
-#
-# From:-Line in email and News postings
-# (otherwise the FQDN is used)
-#
-FROM_HEADER=""
Files old/sysconfig_parts/.sysconfig.mail.swp and new/sysconfig_parts/.sysconfig.mail.swp differ
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Wed May 30 19:49:27 CEST 2007.
--------
--- x11-input-wacom/x11-input-wacom.changes 2007-04-16 11:35:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2007-05-30 13:20:53.628112000 +0200
@@ -1,0 +2,17 @@
+Wed May 30 13:06:26 CEST 2007 - dkukawka(a)suse.de
+
+- updated package to new version v0.7.7-10:
+ - Added 2 new xsetwacom potions (TVResolution0/1 and Screen_No)
+ - Added support for Bamboo
+ - Split wcmXCommand.c from xf86Wacom.c
+ - Added 2 new xsetwacom potions (Common DebugLevel and TwinView)
+ - Increased MAX_SUPPRESS from 20 to 100
+ - Added new xsetwacom option to change suppress
+ - Fixed suppress bug (Allan Wind)
+ - Fixed a xsetwacom button and a relative wheel bug
+ - Prepared for toggling CoreEvent option
+ - Fixed bug 1698123
+ - Incorporated patch 1680163 from Magnus Vigerloe
+ - Updated wacom man page, wacom.4x
+
+-------------------------------------------------------------------
Old:
----
linuxwacom-0.7.7-7.tar.bz2
New:
----
linuxwacom-0.7.7-10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.j30247/_old 2007-05-30 19:37:47.000000000 +0200
+++ /var/tmp/diff_new_pack.j30247/_new 2007-05-30 19:37:47.000000000 +0200
@@ -19,10 +19,10 @@
URL: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
Version: 0.7.7
-Release: 9
+Release: 25
Summary: X11 input module for wacom tablet
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o
-Source: linuxwacom-%{version}-7.tar.bz2
+Source: linuxwacom-%{version}-10.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -71,7 +71,7 @@
Ping Cheng <pingc(a)wacom.com>
%prep
-%setup -n linuxwacom-%{version}-7
+%setup -n linuxwacom-%{version}-10
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -146,6 +146,20 @@
/usr/%_lib/libwacomcfg.so
%changelog
+* Wed May 30 2007 - dkukawka(a)suse.de
+- updated package to new version v0.7.7-10:
+ - Added 2 new xsetwacom potions (TVResolution0/1 and Screen_No)
+ - Added support for Bamboo
+ - Split wcmXCommand.c from xf86Wacom.c
+ - Added 2 new xsetwacom potions (Common DebugLevel and TwinView)
+ - Increased MAX_SUPPRESS from 20 to 100
+ - Added new xsetwacom option to change suppress
+ - Fixed suppress bug (Allan Wind)
+ - Fixed a xsetwacom button and a relative wheel bug
+ - Prepared for toggling CoreEvent option
+ - Fixed bug 1698123
+ - Incorporated patch 1680163 from Magnus Vigerloe
+ - Updated wacom man page, wacom.4x
* Mon Apr 16 2007 - dkukawka(a)suse.de
- update package to new version v0.7.7-7:
- added --enable-wacdump
++++++ linuxwacom-0.7.7-7.tar.bz2 -> linuxwacom-0.7.7-10.tar.bz2 ++++++
++++ 7483 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package eclipse-archdep
checked in at Wed May 30 19:37:22 CEST 2007.
--------
New Changes file:
--- /dev/null 2006-06-16 15:54:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/eclipse-archdep/ecj-bootstrap.changes 2007-05-30 18:36:29.000000000 +0200
@@ -0,0 +1,29 @@
+-------------------------------------------------------------------
+Wed May 30 18:34:54 CEST 2007 - dbornkessel(a)suse.de
+- update to version 0.755 which is included in eclipse 3.3
+
+-------------------------------------------------------------------
+Fri Mar 30 15:34:03 CEST 2007 - rguenther(a)suse.de
+
+- add unzip BuildRequires
+
+-------------------------------------------------------------------
+Wed Nov 15 13:35:03 CET 2006 - dbornkessel(a)suse.de
+
+- corrections in eclipse package only
+
+-------------------------------------------------------------------
+Wed Oct 4 19:17:30 CEST 2006 - dbornkessel(a)suse.de
+
+- update of eclipse archive to 3.2.1 / ecj 0.670
+
+-------------------------------------------------------------------
+Thu Sep 28 00:27:39 CEST 2006 - ro(a)suse.de
+
+- added gcc-gij to BuildRequires
+
+-------------------------------------------------------------------
+Mon Sep 18 11:23:19 CEST 2006 - dbornkessel(a)suse.de
+
+- first version of ecj-bootstrap package
+
New Changes file:
--- /dev/null 2006-06-16 15:54:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/eclipse-archdep/eclipse-archdep.changes 2007-05-30 18:45:24.000000000 +0200
@@ -0,0 +1,211 @@
+-------------------------------------------------------------------
+Wed May 30 18:36:35 CEST 2007 - dbornkessel(a)suse.de
+- renamed package and sub-packages to eclipse-archdep-*; the eclipse-* packages are now noarch packges
+- split eclipse-platform in eclipse-archdep-platform and eclipse-archdep-platform-commons
+- moved arch dependent files to %{_libdir}/eclipse
+- update to 3.3RC2 (Europa)
+
+-------------------------------------------------------------------
+Tue Nov 21 17:22:41 CET 2006 - dbornkessel(a)suse.de
+
+- adjusted x86_64 build to function with updated jpackage-utils package
+
+-------------------------------------------------------------------
+Wed Nov 15 13:34:29 CET 2006 - dbornkessel(a)suse.de
+
+- correct wrong file lists (Bug #220245)
+
+-------------------------------------------------------------------
+Sat Nov 11 18:52:53 CET 2006 - aj(a)suse.de
+
+- Fix permissions of doc files.
+
+-------------------------------------------------------------------
+Thu Sep 28 09:45:31 CEST 2006 - dbornkessel(a)suse.de
+
+- update to version 3.2.1
+- delete redundant BuildRequires
+
+-------------------------------------------------------------------
+Mon Sep 18 11:27:31 CEST 2006 - dbornkessel(a)suse.de
+
+- added ecj-bootstrap spec
+
+-------------------------------------------------------------------
+Thu Jul 27 14:09:02 CEST 2006 - dbornkessel(a)suse.de
+
+- builds now on i386, ppc, x86_64 and ia64
+
+-------------------------------------------------------------------
+Wed Jul 5 18:32:10 CEST 2006 - dbornkessel(a)suse.de
+
+- enabled x86_64 and ia64 builds
+
+-------------------------------------------------------------------
+Fri Mar 10 20:00:37 CET 2006 - dbornkessel(a)suse.de
+
+- enabled ppc build
+
+-------------------------------------------------------------------
+Wed Jan 25 21:44:12 CET 2006 - mls(a)suse.de
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Wed Jan 18 16:30:17 CET 2006 - dbornkessel(a)suse.de
+
+- update to 3.1.1
+
+-------------------------------------------------------------------
+Thu Sep 29 00:41:12 CEST 2005 - dmueller(a)suse.de
+
+ - add norootforbuild
+
+-------------------------------------------------------------------
+Tue Aug 23 16:43:34 CEST 2005 - skh(a)suse.de
+
+- let eclipse require eclipse-gtk2 so that there's never only
+ the README installed [#106699]
+
+-------------------------------------------------------------------
+Tue Aug 9 13:28:18 CEST 2005 - hvogel(a)suse.de
+
+- make eclipse binary executeable again [Bug #102675]
+
+-------------------------------------------------------------------
+Fri Aug 5 03:14:59 CEST 2005 - skh(a)suse.de
+
+- update to 3.1 final
+- clean up specfile
+
+-------------------------------------------------------------------
+Tue Apr 19 14:43:08 CEST 2005 - mmj(a)suse.de
+
+- NULL terminate functions that are supposed to be NULL terminated
+
+-------------------------------------------------------------------
+Mon Feb 21 15:14:58 CET 2005 - skh(a)suse.de
+
+- update to version 3.0.1
+
+-------------------------------------------------------------------
+Tue Sep 28 15:38:15 CEST 2004 - skh(a)suse.de
+
+- Improved Provides: of eclipse-platform to enable update from old
+ eclipse package and fix #46308
+
+-------------------------------------------------------------------
+Mon Sep 20 15:05:58 CEST 2004 - ro(a)suse.de
+
+- added main package containing only a readme
+
+-------------------------------------------------------------------
+Thu Sep 16 16:22:20 CEST 2004 - skh(a)suse.de
+
+- Remove bogus Requires: lucene
+
+-------------------------------------------------------------------
+Sat Sep 11 01:36:01 CEST 2004 - skh(a)suse.de
+
+- update to 3.0 (i386 only for now)
+- use JPackage package layout, splitting into the following
+ subpackages:
+ - eclipse-platform
+ - eclipse-gtk2
+ - eclipse-jdt
+ - eclipse-source
+ - eclipse-pde
+ - eclipse-scripts
+ - libswt3-gtk2
+
+-------------------------------------------------------------------
+Thu Jul 8 16:46:21 CEST 2004 - skh(a)suse.de
+
+- Remove java2 and add BEAJava2 to neededforbuild to fix build
+ (#42849)
+- source setJava from eclipse wrapper script if no java in $PATH
+
+-------------------------------------------------------------------
+Thu May 13 15:07:36 CEST 2004 - skh(a)suse.de
+
+- update to version 2.1.3
+
+-------------------------------------------------------------------
+Fri Apr 23 16:16:42 CEST 2004 - skh(a)suse.de
+
+- Allow SWT to use deprecated gtk functions until a real fix is
+ available from the eclipse project.
+
+-------------------------------------------------------------------
+Mon Mar 15 17:27:54 CET 2004 - skh(a)suse.de
+
+- Really fix #34496 (not only create the needed file, but also
+ install it...)
+- Removed eclipse.desktop file from sources, all done automagically
+ now by the %suse_update_desktop_file macro.
+
+-------------------------------------------------------------------
+Tue Feb 17 14:26:38 CET 2004 - skh(a)suse.de
+
+- use gnome2-devel-packages in neededforbuild
+- Replace buggy wrapper script with a better one (#34496)
+- Fixed problem with correct generation of local workspace
+ configuration ("Completing install..." only once now, not every
+ time eclipse is started, #34496)
+
+-------------------------------------------------------------------
+Mon Feb 16 17:04:26 CET 2004 - skh(a)suse.de
+
+- update to version 2.1.2
+
+-------------------------------------------------------------------
+Thu Feb 12 12:28:05 CET 2004 - ro(a)suse.de
+
+- added gconf2 to neededforbuild
+
+-------------------------------------------------------------------
+Sat Jan 10 15:32:32 CET 2004 - adrian(a)suse.de
+
+- build as user
+
+-------------------------------------------------------------------
+Thu Oct 16 15:42:02 CEST 2003 - skh(a)suse.de
+
+- fix build (use libbonobo instead of bonobo-activation)
+
+-------------------------------------------------------------------
+Tue Sep 2 12:18:21 CEST 2003 - skh(a)suse.de
+
+- fix LD_LIBRARY_PATH in wrapper script
+
+-------------------------------------------------------------------
+Mon Sep 1 16:15:55 CEST 2003 - adrian(a)suse.de
+
+- add Categories
+
+-------------------------------------------------------------------
+Mon Sep 1 13:38:43 CEST 2003 - skh(a)suse.de
+
+- added .desktop file and icon
+
+-------------------------------------------------------------------
+Sat Aug 23 15:30:36 CEST 2003 - ro(a)suse.de
+
+- jakarta-ant was renamed to apache-ant
+
+-------------------------------------------------------------------
+Mon Aug 18 14:31:56 CEST 2003 - skh(a)suse.de
++++ 14 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/eclipse-archdep/eclipse-archdep.changes
New Changes file:
--- /dev/null 2006-06-16 15:54:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/eclipse-archdep/eclipse.changes 2007-05-30 18:44:49.000000000 +0200
@@ -0,0 +1,13 @@
+-------------------------------------------------------------------
+Wed May 30 18:40:01 CEST 2007 - dbornkessel(a)suse.de
+- the original eclipse-* package and it's sub-packages are now renamed to eclipse-archdep-*; this is a noarch package now; in order to be complete, it needs the arch-dependent packages:
+ - eclipse-archdep-gtk2-<version>-<release>.<arch>.rpm
+ - eclipse-archdep-platform-<version>-<release>.<arch>.rpm
+ - libswt3-gtk2-<version>-<release>.<arch>.rpm
+ it creates the packges:
+ - eclipse-<version>-<release>.noarch.rpm
+ - eclipse-jdt-<version>-<release>.noarch.rpm
+ - eclipse-pde-<version>-<release>.noarch.rpm
+ - eclipse-platform-<version>-<release>.noarch.rpm
+ - eclipse-scripts-<version>-<release>.noarch.rpm
+ - eclipse-source-<version>-<release>.noarch.rpm
New:
----
ecj-bootstrap.changes
ecj-bootstrap.spec
eclipse-32.png
eclipse-archdep.changes
eclipse-archdep.spec
eclipse.changes
eclipse.conf
eclipse-gtk.install
eclipse-jdt.install
eclipse-pde.install
eclipse-platform.install
eclipse.script
eclipse-sourceBuild-srcIncluded-3.3RC2.tar.bz2
eclipse-source.install
eclipse.spec
icon.xpm
libswt3-gtk2.install
manifest.ecj
minmem
README.subpacks
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ecj-bootstrap.spec ++++++
#
# spec file for package ecj-bootstrap (Version 0.755)
#
# 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.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: ecj-bootstrap
BuildRequires: fastjar gcc-gij gcc-java libgcj-devel unzip zip
%define eclipse_version 3.3RC2
%define jarname eclipse-ecj
License: Other uncritical OpenSource License
Group: Development/Libraries/Java
Autoreqprov: on
Summary: Eclipse Java Compiler
Version: 0.755
Release: 1
URL: http//www.eclipse.org
Group: Development/Libraries/Java
Source0: eclipse-sourceBuild-srcIncluded-%{eclipse_version}.tar.bz2
Source1: manifest.ecj
#Source2: strange-mandriva-bug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#BuildArchitectures: noarch
#ExclusiveArch: %ix86
BuildArch: noarch
Provides: eclipse-ecj = %{eclipse_version}
%description
This is the Eclipse Java Compiler, which is used in the
java-1_4_2-gcj-compat-devel package
%prep
#<<< package descriptions end
#>>> %prep
%setup -c -T ecj-bootstrap
tar -jxf %{SOURCE0} jdtcoresrc/src
#<<<
#>>> %build
%build
#>>> some useful functions ... used throughout bootstrap packages
TARGET_DIR=`pwd`
CLASSPATH_ORIG="$CLASSPATH"
LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`"
#>>> delete binary file and files not needed
TARGET_DIR=`pwd`
function delBinaryFiles() {
set +x
echo deleting binary files ...
for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"`
do
rm -rf $file
done
set -x
}
#<<<
#>>> make a string with all jar files found in target folder that can be used for a classpath string
# string is saved in JAR_CLASSPATH
function mkTargetClasspath() {
set +x
JAR_CLASSPATH=""
for file in `find %{_javadir} -name "*.jar"`
do
JAR_CLASSPATH=$file:$JAR_CLASSPATH
done
set -x
}
#<<<
#>>> compiles all *.java file in the current directory tree
# uses mkTargetClasspath for CLASSPATH variable
# uses LIB_GCJ for CLASSPATH
function compileFiles() {
mkTargetClasspath
set +x
COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH}
echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $$file
export LANG=en_US
find . -name "*.java" -exec $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH {} +
# for file in `find . -name "*.java"`
# do
# echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file ... \c"
# $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file
# # check for errors
# if [ $? != 0 ]
# then
# echo ERROR
# exit 1;
# fi
# echo done
# done
set -x
}
#<<<
#>>> make jar archive
# PARAM#1: name of jar archive (without .jar suffix)
# uses $TARGET_DIR to move created jar to
function mkJar() {
find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" -or -name "*manifest*" |\
xargs /usr/bin/fastjar -m manifest.* -cf ${1}.jar ;
mv ${1}.jar $TARGET_DIR
}
#<<<
COMPILER_COMMAND="gij -jar %{_javadir}/%{jarname}.jar -cp "
#<<< end functions
delBinaryFiles
#>>> ecj compiler
# we do this twice ... so let's create a function:
function compileEcj() {
pushd jdtcoresrc/src
mkdir tmp
cd tmp
unzip ../ecj.zip
# we have to delete the following class ... it needs ant to compile ... it will be left in later
rm ./org/eclipse/jdt/core/JDTCompilerAdapter.java
# copy the manifest ...
cp %{SOURCE1} .
# Mandriva does not compile without problems ...
# /me ducks:
# %if %{?mandriva_release:1}0
# if [ $1 = "stage1" ]
# then
# cat %{SOURCE2} | patch -p0
# fi
# %endif
compileFiles
mkJar %{jarname}
cd ..
rm -r tmp
popd
}
# compile with gcj
COMPILER_COMMAND="gcj -Wno-deprecated -findirect-dispatch -Bsymbolic -C --classpath "
compileEcj stage1
# compile with ecj
COMPILER_COMMAND="gij -jar $TARGET_DIR/%{jarname}.jar -cp "
compileEcj stage2
#>>> wrapper script
# wrapper script to call ecj:
# ecj script:
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cat >>$RPM_BUILD_ROOT/%{_bindir}/ecj<<EOF
#!/bin/bash
# remove double bootclasspath entries:
BOOTCLASSPATH=""
BOOTCLASSPATH=\$(find %{_javadir} -name "libgcj*.jar" -print | tr "\n" ":"):\$(find %{_javadir}/ -name "glibj*.jar" -print | tr "\n" ":")
OPTIONS=""
while [ \$# -gt 0 ]
do
if [ \$1 = "-bootclasspath" ]
then
BOOTCLASSPATH=\$2:\$BOOTCLASSPATH
shift
shift
continue
fi
OPTIONS="\$OPTIONS \$1"
shift
done
GIJ_EXECUTABLE=\$(ls /usr/bin/gij* | tail -n1)
if [ -e /usr/bin/java ]
then
exec /usr/bin/java -jar %{_javadir}/%{jarname}.jar -bootclasspath \$BOOTCLASSPATH \$OPTIONS
elif [ -e /usr/bin/cacao ]
then
exec /usr/bin/cacao -jar %{_javadir}/%{jarname}.jar -bootclasspath \$BOOTCLASSPATH \$OPTIONS
elif [ -e ]
then
exec \$GIJ_EXECUTABLE -jar %{_javadir}/%{jarname}.jar -bootclasspath \$BOOTCLASSPATH \$OPTIONS
else
echo "no java vm found :("
exit -1
fi
EOF
#<<< wrapper script
# build a jar with a correct manifest
#mkdir manifest-tmp
#pushd manifest-tmp
#/usr/bin/fastjar -xf $TARGET_DIR/%{jarname}.jar
#rm -r META-INF
#/usr/bin/fastjar -m %{SOURCE1} -cf ../%{jarname}.jar *
#popd
#
#<<< ecj compiler end
#<<<
#>>> install
%install
mkdir -p $RPM_BUILD_ROOT/%{_javadir}
cp %{jarname}.jar $RPM_BUILD_ROOT/%{_javadir}
ln -sf %{_javadir}/%{jarname}.jar $RPM_BUILD_ROOT/%{_javadir}/jdtcore.jar
#<<< install end
%clean
rm -rf $RPM_BUILD_ROOT
#>>> files
%files
%defattr(-,root,root)
%{_javadir}/*
%attr(0755,root,root) %{_bindir}/*
#<<<
# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42:
%changelog
* Wed May 30 2007 - dbornkessel(a)suse.de
- update to version 0.755 which is included in eclipse 3.3
* Fri Mar 30 2007 - rguenther(a)suse.de
- add unzip BuildRequires
* Wed Nov 15 2006 - dbornkessel(a)suse.de
- corrections in eclipse package only
* Wed Oct 04 2006 - dbornkessel(a)suse.de
- update of eclipse archive to 3.2.1 / ecj 0.670
* Thu Sep 28 2006 - ro(a)suse.de
- added gcc-gij to BuildRequires
* Mon Sep 18 2006 - dbornkessel(a)suse.de
- first version of ecj-bootstrap package
++++++ eclipse-archdep.spec ++++++
++++ 609 lines (skipped)
++++++ eclipse.spec ++++++
#
# spec file for package eclipse (Version 3.3RC2)
#
# 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.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
# icecream 0
Name: eclipse
%define archdepname %{name}-archdep
# build requires are minimal for 3.2 ... checked it!
BuildRequires: %{archdepname} %{archdepname}-jdt %{archdepname}-pde %{archdepname}-platform-commons %{archdepname}-scripts %{archdepname}-source fdupes libswt3-gtk2 unzip
# Uncomment if you want to test eclipse in the chroot environment:
#BuildRequires: agfa-fonts ant fontconfig fonts-config gcc-c++ ghostscript-fonts-other ghostscript-fonts-std gnutls-devel jakarta-commons-logging libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel openmotif regexp servlet23 servletapi5 update-alternatives update-desktop-files xml-commons-apis xorg-x11 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-scalable zip java-1_5_0-devel
%define pkg_summary An open extensible IDE
%define section free
%define swt_version 3063
%define corelib_version 3.3RC2
%define eclipse_major 3
%define eclipse_minor 3RC2
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 1
%define libname libswt3
Summary: Eclipse Platform and Java IDE
Version: 3.3RC2
Release: 1
License: Any permissive
Group: Development/Tools/IDE
URL: http://www.eclipse.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{archdepname}-gtk2
BuildArch: noarch
%description
The Eclipse Platform is designed for building integrated development
environments (IDEs) that can be extended by custom plug-ins. The base
distribution also contains a full-featured Java development
environment.
NOTE: Although it runs with the open source gcj Java, it is advisable
to install SUN's, IBM's or BEA's Java
(java-1_4_2-sun,java-1_5_0-sun,java-1_4_2-ibm, java-1_5_0-ibm or
java-1_4_2-bea) due to performance reasons.
Authors:
--------
IBM
%package platform
Summary: Eclipse platform common files
Group: Development/Tools/IDE
Requires: ant, regexp >= 1.2
# xml-commons-apis disabled due to
# http://developer.java.sun.com/developer/bugParade/bugs/4749727.html
#Requires: xml-commons-apis
Requires: jakarta-commons-logging
Requires: servlet23
Provides: eclipse:/opt/eclipse/eclipse
Obsoletes: %{name}-sdk
Provides: %{name}-sdk
Requires: %{archdepname}-platform
%description platform
The Eclipse Platform is designed for building integrated development
environments (IDEs) which can be extended by custom plugins.
This package contains the Eclipse platform common files. In addition to
this, you'll need the startup scripts and a UI package (GTK2) to be
able to run the IDE.
Authors:
--------
IBM
%package jdt
Summary: Eclipse Java development tools
Group: Development/Tools/IDE
Requires: %{name}-ui = %{version}, junit
%description jdt
The Eclipse Platform is designed for building integrated development
environments (IDEs) which can be extended by custom plugins.
This package contains the Eclipse Java development tools, a
full-featured Java development environment.
Authors:
--------
IBM
%package source
Summary: Eclipse Source
Group: Development/Tools/IDE
%description source
The Eclipse Platform is designed for building integrated development
environments (IDEs) which can be extended by custom plugins.
This package contains the sources for the Eclipse Platform and Java
IDE.
Authors:
--------
IBM
%package pde
Summary: Eclipse Plugin Development Environment
Group: Development/Tools/IDE
Requires: %{name}-ui = %{version}
Requires: %{name}-source = %{version}
%description pde
The Eclipse Platform is designed for building integrated development
environments (IDEs) which can be extended by custom plugins.
This package contains the Eclipse Plugin Development Environment.
Authors:
--------
IBM
%package scripts
Summary: Eclipse Platform and Java IDE startup scripts
Group: Development/Tools/IDE
Requires: %{name}-ui = %{version}
Requires: /usr/bin/perl
%description scripts
The Eclipse Platform is designed for building integrated development
environments (IDEs) which can be extended by custom plugins.
This package contains the Eclipse startup scripts.
Authors:
--------
IBM
%prep
%build
%install
export NO_BRP_CHECK_BYTECODE_VERSION="true"
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
for rpm in %{archdepname} %{archdepname}-jdt %{archdepname}-pde %{archdepname}-platform-commons %{archdepname}-scripts %{archdepname}-source
do
FILES=$( echo $rpm | sed "s/%{archdepname}/eclipse/").files
for file in $( rpm -q --list $rpm | sort )
do
DESTDIR=$RPM_BUILD_ROOT/$(dirname $file)
if [ -d $file ]
then
mkdir -p $DESTDIR/$file
echo "%dir $file" >> $FILES
continue
fi
if [ ! -e $DESTDIR ]
then
mkdir -p $DESTDIR
fi
echo $file >> $FILES
cp $file $DESTDIR
done
done
# hardlink duplicates:
# add files that should not be hardlinked here:
function hardlink_duplicates() {
IFS="
"
# get all duplicates:
for dup in $(fdupes -r -n -1 .)
do
IFS="
";
# handle each duplicate-tuple
for file in $dup
do
# the first file will be taken as the original file
if [ -z "$ORIG_FILE" ]
then
ORIG_FILE=$file;
else
# test, whether file is on the ignore list:
if [ -n "$IGNORE_FILENAMES" ]
then
for ignorefile in "$IGNORE_FILENAMES"
do
if echo "$ORIG_FILE" | grep "$ignorefile" || echo "$file" | grep "$ignorefile"
then
printf '%%-55s -> %s -- #IGNORED\n' $ORIG_FILE $file >> %{_builddir}/HARDLINKS.txt
IGNORE=true
fi
break
done
fi
if [ "$IGNORE" = false ]
then
# link file
ln -f $ORIG_FILE $file;
printf '%%-65s -> %s\n' $ORIG_FILE $file >> %{_builddir}/HARDLINKS.txt
fi
IGNORE=false
fi;
done;
ORIG_FILE="";
IFS="
";
done
IFS="
"
}
cd $RPM_BUILD_ROOT
IGNORE_FILENAMES=""
hardlink_duplicates
%clean
rm -rf $RPM_BUILD_ROOT
%files -f eclipse.files
%defattr(-,root,root,-)
%files platform -f eclipse-platform-commons.files
%defattr(-,root,root,-)
%files jdt -f eclipse-jdt.files
%defattr(-,root,root,-)
%files source -f eclipse-source.files
%defattr(-,root,root,-)
%files pde -f eclipse-pde.files
%defattr(-,root,root,-)
%files scripts -f eclipse-scripts.files
%defattr(-,root,root,-)
%changelog
* Wed May 30 2007 - dbornkessel(a)suse.de
- the original eclipse-* package and it's sub-packages are now renamed to eclipse-archdep-*; this is a noarch package now; in order to be complete, it needs the arch-dependent packages:
- eclipse-archdep-gtk2-<version>-<release>.<arch>.rpm
- eclipse-archdep-platform-<version>-<release>.<arch>.rpm
- libswt3-gtk2-<version>-<release>.<arch>.rpm
it creates the packges:
- eclipse-<version>-<release>.noarch.rpm
- eclipse-jdt-<version>-<release>.noarch.rpm
- eclipse-pde-<version>-<release>.noarch.rpm
- eclipse-platform-<version>-<release>.noarch.rpm
- eclipse-scripts-<version>-<release>.noarch.rpm
- eclipse-source-<version>-<release>.noarch.rpm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0