Hello community,
here is the log from the commit of package sax2
checked in at Thu Feb 28 18:24:23 CET 2008.
--------
--- sax2/sax2.changes 2008-02-22 10:10:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-02-28 17:20:12.967116000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 28 15:31:37 CET 2008 - ms@suse.de
+
+- moved internal perl bindings to the library package (bnc #365593)
+- fixed some rpmlint complains (bnc #365593)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.c29203/_old 2008-02-28 18:23:43.000000000 +0100
+++ /var/tmp/diff_new_pack.c29203/_new 2008-02-28 18:23:43.000000000 +0100
@@ -33,13 +33,14 @@
BuildRequires: java2-devel-packages
%endif
%endif
-Requires: perl readline ncurses hal dbus-1 sax2-libsax
+Requires: perl = %{perl_version}
+Requires: readline ncurses hal dbus-1 sax2-libsax
Requires: sax2-ident sax2-tools
Requires: xorg-x11-server
PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 359
+Release: 361
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -109,13 +110,7 @@
Marcus Sch�fer
%package -n sax2-gui
-%if %{?suse_version:1}0
-# SuSE Requires...
Requires: netpbm sax2-tools icewm-bin sax2
-%else
-# FC5 Requires...
-Requires: netpbm sax2-tools qt sax2
-%endif
Summary: SuSE advanced X Window System-configuration GUI
Group: System/X11/Utilities
Provides: sax2:/usr/sbin/xapi
@@ -130,18 +125,13 @@
Marcus Sch�fer
%package -n sax2-libsax
-%if %{?suse_version:1}0
-# SuSE Requires...
+Requires: perl = %{perl_version}
Requires: sax2-tools sax2-libsax-perl icewm-bin
%if %{suse_version} <= 1020
%ifarch %ix86 x86_64
Requires: 915resolution
%endif
%endif
-%else
-# FC5 Requires...
-Requires: sax2-tools qt sax2
-%endif
Summary: SaX management library for X Window System-configuration
Group: Development/Libraries/X11
Provides: sax2:/usr/%{_lib}/libsax.so
@@ -156,7 +146,7 @@
Marcus Sch�fer
%package -n sax2-libsax-devel
-Requires: sax2-libsax
+Requires: sax2-libsax = %version
Summary: SaX header files for X Window System-configuration
Group: Development/Libraries/X11
@@ -171,6 +161,7 @@
Marcus Sch�fer
%package -n sax2-libsax-perl
+Requires: perl = %{perl_version}
Summary: Language binding to use libsax with perl
Group: Development/Libraries/X11
@@ -186,12 +177,9 @@
%package -n sax2-libsax-python
Requires: sax2-libsax
-%if %{?suse_version:1}0
-# SuSE Requires...
-%{py_requires}
-%endif
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
@@ -249,7 +237,6 @@
#-------------------------------------------------
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/var/log
touch $RPM_BUILD_ROOT/var/log/SaX.log
make buildroot=$RPM_BUILD_ROOT \
@@ -260,28 +247,19 @@
install
find $RPM_BUILD_ROOT -name "*.bs" | xargs rm -f
%find_lang sax
-%if %{?suse_version:1}0
- # 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
-%else
- # FC5 specific build instructions...
- #=================================================
- # remove unpacked sources...
- #-------------------------------------------------
- rm -f $RPM_BUILD_ROOT/%{perl_vendorarch}/*.pl
- rm -f $RPM_BUILD_ROOT/%{perl_archlib}/perllocal.pod
-%endif
+# 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
#=================================================
# uninstall script stage:[previous]
#-------------------------------------------------
@@ -353,20 +331,6 @@
%{_datadir}/sax/sysp/script/psection.pl
%{_datadir}/sax/sysp/script/profiledriver.pl
%{_datadir}/sax/sysp/script/vendor.pl
-%{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
-%if %{?suse_version:1}0
-# SuSE files...
-/var/adm/perl-modules/sax2
-%endif
%doc %{_defaultdocdir}/sax2/LICENSE
%doc %{_defaultdocdir}/sax2/README
#=================================================
@@ -384,10 +348,7 @@
%{_datadir}/sax/api/data/xapi.gtx
%{_sbindir}/xapi
%{_sbindir}/xfine
-%if %{?suse_version:1}0
-# SuSE files...
%{_datadir}/applications/sax2.desktop
-%endif
#=================================================
# SaX-Tools file list...
# ------------------------------------------------
@@ -439,6 +400,17 @@
%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...
# ------------------------------------------------
@@ -482,6 +454,9 @@
%endif
%changelog
+* Thu Feb 28 2008 ms@suse.de
+- moved internal perl bindings to the library package (bnc #365593)
+- fixed some rpmlint complains (bnc #365593)
* Fri Feb 22 2008 ms@suse.de
- added SaX2-theme-Oxygen by default (bnc #363763)
* Wed Feb 20 2008 ms@suse.de
++++++ sax2.desktop ++++++
--- sax2/sax2.desktop 2008-02-22 10:10:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.desktop 2008-02-28 17:19:43.888384000 +0100
@@ -1,7 +1,9 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
X-KDE-SubstituteUID=true
Exec=/usr/sbin/sax2
Name=SaX2
Icon=sax2
GenericName=Configure X11 System
+
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/Makefile new/sax/Makefile
--- old/sax/Makefile 2007-06-22 16:53:48.000000000 +0200
+++ new/sax/Makefile 2008-02-28 16:33:08.000000000 +0100
@@ -193,7 +193,7 @@
# install core files...
#--------------------------------------------
for i in `find ./profile -type f | grep -v TREE`; do \
- echo $$i | grep -q .pl$ && \
+ echo $$i | grep -q .pl$$ && \
install -m 755 $$i ${PROFILE} || \
install -m 644 $$i ${PROFILE} ;\
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/profile/script/IntelNext_DualHead.pl new/sax/profile/script/IntelNext_DualHead.pl
--- old/sax/profile/script/IntelNext_DualHead.pl 2007-08-13 14:57:43.000000000 +0200
+++ new/sax/profile/script/IntelNext_DualHead.pl 2008-02-28 15:44:17.000000000 +0100
@@ -24,7 +24,7 @@
my $mlayout = ProfileIntelSetupMonitorLayout ($profile);
open (FD,">>",$profile) ||
- die "Intel_DualHead: Can't open $profile: $!";
+ die "IntelNext_DualHead: Can't open $profile: $!";
print FD "Device->[X]->Raw->20->Option=\"MonitorLayout\" \"$mlayout\"\n";
print FD "Device->[X+1]->Raw->20->Option=\"MonitorLayout\" \"$mlayout\"\n";
#====================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild 2008-02-22 10:10:11.000000000 +0100
+++ new/sax/svnbuild 2008-02-28 17:19:37.000000000 +0100
@@ -1 +1 @@
-1525
+1530
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org