Hello community, here is the log from the commit of package sax2 for openSUSE:Factory checked in at Thu Oct 13 16:20:44 CEST 2011.
-------- --- openSUSE:Factory/sax2/sax2.changes 2011-09-23 12:45:19.000000000 +0200 +++ sax2/sax2.changes 2011-10-13 11:13:21.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 13 09:12:23 UTC 2011 - co...@suse.com + +- clean up spec file for real - to fix build in just building + what we need + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sax2-gcc43.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.UxrZ7B/_old 2011-10-13 16:20:40.000000000 +0200 +++ /var/tmp/diff_new_pack.UxrZ7B/_new 2011-10-13 16:20:40.000000000 +0200 @@ -15,87 +15,65 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%ifarch s390 s390x -%define sax2all 0 -%else -%define sax2all 0 -%endif - -%if %{suse_version} > 1120 -%define use_gcc43 0 -%else -%define use_gcc43 0 -%endif Name: sax2 -Url: http://sax.berlios.de -%define build_java 0 -%if %{suse_version} > 1010 -BuildRequires: antlr bison doxygen flex gettext-devel ghostscript-fonts-std -BuildRequires: graphviz python-devel -BuildRequires: libqt4 libqt4-devel libqt4-qt3support libqt4-x11 -BuildRequires: hwinfo-devel readline-devel swig update-desktop-files -BuildRequires: xorg-x11-server-sdk -%if %{suse_version} > 1020 -BuildRequires: fdupes -%endif -%if %use_gcc43 -BuildRequires: -gcc gcc43 gcc43-c++ -%endif -%if %{build_java} -BuildRequires: java-1_4_2-gcj-compat-devel -%endif -%endif -%if %{suse_version} <= 1010 -BuildRequires: doxygen ghostscript-fonts-std graphviz python-devel -BuildRequires: qt qt-devel qt-qt3support qt-x11 -BuildRequires: gcc-c++ readline-devel swig sysfsutils update-desktop-files -BuildRequires: freetype2-devel libpng-devel -%if %{build_java} -BuildRequires: java2-devel-packages -%endif -%endif -Requires: perl = %{perl_version} -Requires: readline ncurses dbus-1 sax2-libsax -Requires: sax2-ident sax2-tools -Requires: xorg-x11-server -Requires: xdg-utils -PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq -Summary: SuSE advanced X Window System-configuration Version: 8.1 Release: 603 -Group: System/X11/Utilities License: GPLv2+ +Summary: SuSE advanced X Window System-configuration +Url: http://sax.berlios.de +Group: System/X11/Utilities Source: sax2.tar.bz2 Source1: sax2.desktop Source2: sax2-rpmlintrc -%if %use_gcc43 -Patch0: sax2-gcc43.diff -%endif Patch1: sax2-tools-only.diff Patch2: nohal.diff +BuildRequires: antlr +BuildRequires: bison +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: gettext-devel +BuildRequires: ghostscript-fonts-std +BuildRequires: graphviz +BuildRequires: hwinfo-devel +BuildRequires: libqt4 +BuildRequires: libqt4-devel +BuildRequires: libqt4-qt3support +BuildRequires: libqt4-x11 +BuildRequires: python-devel +BuildRequires: readline-devel +BuildRequires: swig +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-server-sdk +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: /bin/mkdir +PreReq: /bin/rm +PreReq: /usr/bin/chroot +Requires: dbus-1 +Requires: ncurses +Requires: perl = %{perl_version} +Requires: readline +Requires: sax2-ident +Requires: sax2-libsax +Requires: sax2-tools +Requires: xdg-utils +Requires: xorg-x11-server BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the SuSE Advanced X-Configuration - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - %package -n sax2-tools License: GPLv2+ Summary: X Window System tools for SaX2 Group: System/X11/Utilities Requires: coreutils +Supplements: packageand(yast2-installation:xorg-x11) Provides: saxtools Obsoletes: saxtools -Supplements: packageand(yast2-installation:xorg-x11) -%if ! %sax2all Provides: sax2 Obsoletes: sax2 Provides: sax2-gui @@ -106,166 +84,17 @@ Obsoletes: sax2-libsax-perl Provides: sax2-ident Obsoletes: sax2-ident -%endif %description -n sax2-tools Some small X Window System tools to handle input devices, for example, mouse and keyboard. - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%if %sax2all - -%package -n sax2-ident -License: LGPLv2.1+ -Summary: SaX2 identity and profile information -Group: System/X11/Utilities -Provides: sax2:/usr/share/sax/sysp/maps/Identity.map -Provides: sax2-tools:/usr/share/sax/sysp/maps/Identity.map -Provides: saxident -Obsoletes: saxident -Requires: sax2 sax2-libsax-perl - -%description -n sax2-ident -This package contains information about the supported graphics hardware -and its special parameters. For some graphics cards a profile is needed -to describe configuration parameters outside the ordinary way of -setting up the card with SaX2. - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%package -n sax2-gui -License: GPLv2+ -Requires: netpbm sax2-tools icewm-bin sax2 -Summary: SuSE advanced X Window System-configuration GUI -Group: System/X11/Utilities -Provides: sax2:/usr/sbin/xapi - -%description -n sax2-gui -This package contains the GUI for the SuSE Advanced X-Configuration - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%package -n sax2-libsax -License: GPLv2+ -Requires: perl = %{perl_version} -Requires: sax2-tools sax2-libsax-perl icewm-bin -%if %{suse_version} <= 1020 -%ifarch %ix86 x86_64 -Requires: 915resolution -%endif -%endif -Summary: SaX management library for X Window System-configuration -Group: Development/Libraries/X11 -Provides: sax2:/usr/%{_lib}/libsax.so - -%description -n sax2-libsax -libsax provides a C++ written library to manage X11 configurations - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%package -n sax2-libsax-devel -License: GPLv2+ -Requires: sax2-libsax = %version -Summary: SaX header files for X Window System-configuration -Group: Development/Libraries/X11 - -%description -n sax2-libsax-devel -The devel package of libsax provides all header files needed to use -libsax in your own development environment - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%package -n sax2-libsax-perl -License: GPLv2+ -Requires: perl = %{perl_version} -Summary: Language binding to use libsax with perl -Group: Development/Libraries/X11 - -%description -n sax2-libsax-perl -This package provides a wrapper to be able to use libsax in perl -written programs - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%package -n sax2-libsax-python -License: GPLv2+ -Requires: sax2-libsax -Summary: Language binding to use libsax with python -Group: Development/Libraries/X11 -%py_requires - -%description -n sax2-libsax-python -This package provides a wrapper to be able to use libsax in python -written programs - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%if %{build_java} - -%package -n sax2-libsax-java -License: GPL v2 or later -Requires: sax2-libsax jre1.2.x -Summary: Language binding to use libsax with java -Group: Development/Libraries/X11 - -%description -n sax2-libsax-java -This package provides a wrapper to be able to use libsax in java -written programs - - - -Authors: --------- - Marcus Schaefer <m...@suse.de> - -%endif -%endif - %prep %setup -n sax -%if %use_gcc43 -%patch0 -p1 -%endif -%if ! %sax2all %patch1 -p0 -%endif %patch2 -p0 %build -%if %use_gcc43 -CC=gcc-4.3 -CXX=g++-4.3 -export CC CXX -%endif # disable as-needed to fix build export SUSE_ASNEEDED=0 test -e /.buildenv && . /.buildenv @@ -282,61 +111,29 @@ #================================================= # build sources #------------------------------------------------- -make bindlib=%{_lib} buildroot=$RPM_BUILD_ROOT +make bindlib=%{_lib} buildroot=%{buildroot} #================================================= # install sources #------------------------------------------------- %install -%if %sax2all -mkdir -p $RPM_BUILD_ROOT/var/log -touch $RPM_BUILD_ROOT/var/log/SaX.log -make buildroot=$RPM_BUILD_ROOT \ +make buildroot=%{buildroot} \ bindlib=%{_lib} \ - lib_prefix=$RPM_BUILD_ROOT/usr/%{_lib} \ - doc_prefix=$RPM_BUILD_ROOT/%{_defaultdocdir} \ - man_prefix=$RPM_BUILD_ROOT/%{_mandir} \ - install -find $RPM_BUILD_ROOT -name "*.bs" | xargs rm -f -%find_lang sax -# SuSE specific build instructions... -#================================================= -# check perl .packlist... -#------------------------------------------------- -%perl_process_packlist -#================================================= -# remove unpacked sources... -#------------------------------------------------- -rm -f $RPM_BUILD_ROOT/%{perl_vendorarch}/*.pl -#================================================= -# update desktop file -#------------------------------------------------- -%suse_update_desktop_file -i %name System SystemSetup -#================================================= -# file duplicates -#------------------------------------------------- -%if %{suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT/usr/share/sax/api/figures -%endif -%else -make buildroot=$RPM_BUILD_ROOT \ - bindlib=%{_lib} \ - lib_prefix=$RPM_BUILD_ROOT/usr/%{_lib} \ - doc_prefix=$RPM_BUILD_ROOT/%{_defaultdocdir} \ - man_prefix=$RPM_BUILD_ROOT/%{_mandir} \ + lib_prefix=%{buildroot}%{_libdir} \ + doc_prefix=%{buildroot}/%{_defaultdocdir} \ + man_prefix=%{buildroot}/%{_mandir} \ install-docs cd tools -make buildroot=$RPM_BUILD_ROOT \ +make buildroot=%{buildroot} \ bindlib=%{_lib} \ - lib_prefix=$RPM_BUILD_ROOT/usr/%{_lib} \ - doc_prefix=$RPM_BUILD_ROOT/%{_defaultdocdir} \ - man_prefix=$RPM_BUILD_ROOT/%{_mandir} \ + lib_prefix=%{buildroot}%{_libdir} \ + doc_prefix=%{buildroot}/%{_defaultdocdir} \ + man_prefix=%{buildroot}/%{_mandir} \ install cd .. -rm -rf $RPM_BUILD_ROOT/usr/lib/perl5 -rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/sax2/{LICENSE,README,sax.pdf} -rm $RPM_BUILD_ROOT/%{_mandir}/man1/sax2.1 -%endif +rm -rf %{buildroot}%{_prefix}/lib/perl5 +rm -rf %{buildroot}%{_datadir}/doc/packages/sax2/{LICENSE,README,sax.pdf} +rm %{buildroot}/%{_mandir}/man1/sax2.1 #================================================= # uninstall script stage:[previous] #------------------------------------------------- @@ -346,111 +143,6 @@ if [ ! -d /var/cache/xfine ];then mkdir -p /var/cache/xfine fi -%if %sax2all - -%post -n sax2-ident -if ls var/lib/hardware/ids/* &> /dev/null; then - > var/lib/hardware/hd.ids - for i in var/lib/hardware/ids/*; do - cat $i >> var/lib/hardware/hd.ids - done -fi - -%postun -n sax2-ident -if [ "$1" -eq 0 ]; then - if ls var/lib/hardware/ids/* &> /dev/null; then - > var/lib/hardware/hd.ids - for i in var/lib/hardware/ids/*; do - cat $i >> var/lib/hardware/hd.ids - done - else - rm -f var/lib/hardware/hd.ids - fi -fi - -%post -n sax2-libsax -p /sbin/ldconfig - -%postun -n sax2-libsax -p /sbin/ldconfig - -%files -%defattr(-,root,root) -#================================================= -# SaX files... -#------------------------------------------------- -%ghost %config(noreplace) /var/log/SaX.log -%dir %{_datadir}/sax/api -%dir %{_datadir}/sax/api/data -%dir %{_defaultdocdir}/sax2 -%dir %{_datadir}/sax -%dir %{_datadir}/sax/sysp/script -%dir %{_datadir}/sax/sysp -%dir %{_datadir}/sax/libsax -%dir %{_var}/lib/sax -%dir /var/cache/sax/sysp -%dir /var/cache/sax/sysp/rdbms -%dir /var/cache/sax/files -%dir /var/cache/sax -%dir /var/cache/xfine -%dir /etc/icewm -%{_datadir}/sax/libsax/* -%{_datadir}/pixmaps/sax2.png -%{_datadir}/sax/svnbuild -%{_datadir}/sax/init.pl -%{_datadir}/sax/xc.pl -%{_datadir}/sax/pci.pl -%{_datadir}/sax/modules -%{_sbindir}/sax.sh -%{_sbindir}/sax2-vesa -%{_sbindir}/SaX2 -%{_sbindir}/sax2 -%{_sbindir}/sysp -%{_sbindir}/xcmd -%{_datadir}/sax/api/data/fvwmrc.sax -%{_datadir}/sax/api/data/twmrc.sax -%config /etc/icewm/icerc.sax -%{_datadir}/sax/api/data/CardModules -%{_datadir}/sax/api/data/LangCodes -%{_datadir}/sax/api/data/PointerDevice -%{_datadir}/sax/api/data/LangFirstPath -%{_datadir}/sax/api/data/StaticFontPathList -%{_datadir}/sax/api/data/MonitorColors -%{_datadir}/sax/api/data/TabletModules -%{_datadir}/sax/api/data/MonitorRatio -%{_datadir}/sax/api/data/MonitorResolution -%{_datadir}/sax/api/data/MonitorTraversal -%{_datadir}/sax/sysp/script/installed.pl -%{_datadir}/sax/sysp/script/killdot.pl -%{_datadir}/sax/sysp/script/memory.pl -%{_datadir}/sax/sysp/script/machine.pl -%{_datadir}/sax/sysp/script/preparelog.pl -%{_datadir}/sax/sysp/script/checkmap.pl -%{_datadir}/sax/sysp/script/profilecount.pl -%{_datadir}/sax/sysp/script/psection.pl -%{_datadir}/sax/sysp/script/profiledriver.pl -%{_datadir}/sax/sysp/script/vendor.pl -%doc %{_defaultdocdir}/sax2/LICENSE -%doc %{_defaultdocdir}/sax2/README -%doc %{_mandir}/man1/sax2.1.gz -#================================================= -# SaX-GUI file list... -# ------------------------------------------------ - -%files -n sax2-gui -f sax.lang -%defattr(-,root,root) -%dir %{_datadir}/sax/api -%dir %{_datadir}/xfine -%{_datadir}/sax/api/macros -%{_datadir}/sax/api/figures -%{_datadir}/xfine/figures -%{_datadir}/xfine/xfine.gtx -%{_datadir}/sax/api/data/xapi.gtx -%{_sbindir}/xapi -%{_sbindir}/xfine -%{_datadir}/applications/sax2.desktop -%endif -#================================================= -# SaX-Tools file list... -# ------------------------------------------------ %files -n sax2-tools %defattr(-,root,root) @@ -472,96 +164,5 @@ %{_sbindir}/vncp %{_sbindir}/xw %{_sbindir}/getPrimary -%if %sax2all -#================================================= -# SaX-Ident file list... -# ------------------------------------------------ - -%files -n sax2-ident -%defattr(-,root,root) -#%dir /etc/udev/rules.d -%dir %{_datadir}/sax -%dir %{_datadir}/sax/api -%dir %{_datadir}/sax/api/data/cdb -%dir %{_datadir}/sax/api/data -%dir %{_datadir}/sax/sysp/maps -%dir %{_datadir}/sax/sysp -%dir /var/lib/hardware -#%config /etc/udev/rules.d/*.rules -%{_datadir}/sax/sysp/maps/Identity.map -%{_datadir}/sax/sysp/maps/Keyboard.map -%{_datadir}/sax/sysp/maps/Vendor.map -%{_datadir}/sax/sysp/maps/Input.map -%{_datadir}/sax/sysp/maps/Driver.map -%{_datadir}/sax/sysp/maps/IntelPatch.map -%{_datadir}/sax/api/data/cdb/Cards -%{_datadir}/sax/api/data/cdb/Pads -%{_datadir}/sax/api/data/cdb/Pens -%{_datadir}/sax/api/data/cdb/Pointers -%{_datadir}/sax/api/data/cdb/Tablets -%{_datadir}/sax/api/data/cdb/Touchscreens -%config %{_datadir}/sax/api/data/cdb/Monitors -%{_datadir}/sax/profile -/var/lib/hardware/ids -#================================================= -# SaX-libsax file list... -# ------------------------------------------------ - -%files -n sax2-libsax -%defattr(-,root,root) -%{_prefix}/%{_lib}/libsax.so.* -%{perl_vendorarch}/XFree.pm -%{perl_vendorarch}/auto/XFree -%{perl_vendorarch}/PLog.pm -%{perl_vendorarch}/auto/PLog -%{perl_vendorarch}/SPP.pm -%{perl_vendorarch}/auto/SPP -%{perl_vendorarch}/FBSet.pm -%{perl_vendorarch}/auto/FBSet -%{perl_vendorarch}/CVT.pm -%{perl_vendorarch}/auto/CVT -/var/adm/perl-modules/sax2 -#================================================= -# SaX-libsax-devel file list... -# ------------------------------------------------ - -%files -n sax2-libsax-devel -%defattr(-,root,root) -%dir %{_includedir}/sax -%dir %{_defaultdocdir}/libsax -%doc %{_defaultdocdir}/libsax/html -%doc %{_defaultdocdir}/sax2/sax.pdf -%{_prefix}/%{_lib}/libsax.so -%{_includedir}/sax/* -#================================================= -# SaX-libsax-perl file list... -# ------------------------------------------------ - -%files -n sax2-libsax-perl -%defattr(-,root,root) -%{perl_vendorarch}/SaX.pm -%{perl_vendorarch}/auto/SaX -#================================================= -# SaX-libsax-python file list... -# ------------------------------------------------ - -%files -n sax2-libsax-python -%defattr(-,root,root) -%dir %{py_sitedir}/SaX -%{py_sitedir}/SaX.pth -%{py_sitedir}/SaX/* -#================================================= -# SaX-libsax-java file list... -# ------------------------------------------------ -%if %{build_java} - -%files -n sax2-libsax-java -%defattr(-,root,root) -%dir %{_prefix}/%{_lib}/sax -%dir %{_prefix}/%{_lib}/sax/plugins -%{_datadir}/java/SaX.jar -%{_prefix}/%{_lib}/sax/plugins/SaX.so -%endif -%endif %changelog ++++++ sax2-tools-only.diff ++++++ --- /var/tmp/diff_new_pack.UxrZ7B/_old 2011-10-13 16:20:40.000000000 +0200 +++ /var/tmp/diff_new_pack.UxrZ7B/_new 2011-10-13 16:20:40.000000000 +0200 @@ -1,5 +1,7 @@ ---- tools/xkbctrl/xkbctrl.pl.orig 2010-05-12 16:46:26.000000000 +0200 -+++ tools/xkbctrl/xkbctrl.pl 2010-05-12 16:46:54.000000000 +0200 +Index: tools/xkbctrl/xkbctrl.pl +=================================================================== +--- tools/xkbctrl/xkbctrl.pl.orig 2009-05-27 22:53:08.000000000 +0200 ++++ tools/xkbctrl/xkbctrl.pl 2011-10-13 10:34:02.779076489 +0200 @@ -13,7 +13,7 @@ use strict; #================================= # Globals... @@ -9,3 +11,41 @@ #================================= # The magic main :-) +Index: Makefile +=================================================================== +--- Makefile.orig 2009-05-27 22:54:14.000000000 +0200 ++++ Makefile 2011-10-13 10:58:41.719818315 +0200 +@@ -105,27 +105,17 @@ all: + # building libsax and bindings... + #-------------------------------------------- + ( test -f /usr/lib/graphviz/libgvplugin_dot_layout.so && dot -c || true ) +- ( cd libsax && doxygen sax.dox ) +- ( cd libsax && ./.make ) +- ${MAKE} -C ./libsax all +- ( cd libsax && \ +- for i in `ls -1 ./bindings`; do \ +- if [ -d ./bindings/$$i ];then \ +- ( \ +- cd ./bindings/$$i && \ +- make -f Makefile.swig && make BINDLIB=${bindlib} \ +- ) ;\ +- fi \ +- done ) ++ #( cd libsax && ./.make ) ++ #${MAKE} -C ./libsax all + + #============================================ + # building GUI and tools... + #-------------------------------------------- +- ( cd api && ./.make ) +- ( cd api/xcmd && ./.make ) ++ #( cd api && ./.make ) ++ #( cd api/xcmd && ./.make ) + ( cd tools && make -f Makefile.ac buildroot=${buildroot} ) +- ${MAKE} -C ./api/xcmd all +- ${MAKE} -C ./api all ++ #${MAKE} -C ./api/xcmd all ++ #${MAKE} -C ./api all + ${MAKE} -C ./tools all + + #============================================ continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
