Hello community, here is the log from the commit of package setserial for openSUSE:Factory checked in at 2012-02-21 12:25:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/setserial (Old) and /work/SRC/openSUSE:Factory/.setserial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "setserial", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/setserial/setserial.changes 2012-01-11 15:38:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.setserial.new/setserial.changes 2012-02-21 12:25:52.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 17 15:38:43 UTC 2012 - [email protected] + +- place binary in /usr tree (UsrMerge project) +- add patch to modify the initialization script to properly handle + relocated binaries + +------------------------------------------------------------------- +Mon Feb 13 17:03:49 UTC 2012 - [email protected] + +- removed symlink to obsoleted init script + +------------------------------------------------------------------- New: ---- setserial-2.17-binaryInUsr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ setserial.spec ++++++ --- /var/tmp/diff_new_pack.VKsUhK/_old 2012-02-21 12:25:57.000000000 +0100 +++ /var/tmp/diff_new_pack.VKsUhK/_new 2012-02-21 12:25:57.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: setserial Version: 2.17 Release: 0 @@ -32,6 +31,7 @@ Patch1: %{name}-%{version}-error.diff Patch2: %{name}-%{version}-prototypes.diff Patch3: %{name}-%{version}-nohayes.diff +Patch4: %{name}-%{version}-binaryInUsr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,23 +45,23 @@ %patch1 %patch2 %patch3 -p1 +%patch4 %build CFLAGS="$RPM_OPT_FLAGS -Wall" \ - ./configure \ - --prefix=%{_prefix} \ - --bindir=/bin \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir} +%configure make %install -mkdir -p ${RPM_BUILD_ROOT}/bin +mkdir -p ${RPM_BUILD_ROOT}/%{_bindir} mkdir -p ${RPM_BUILD_ROOT}/etc/init.d mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} -make install DESTDIR="$RPM_BUILD_ROOT" STRIP=: -ln -sf /etc/init.d/setserial ${RPM_BUILD_ROOT}%{_sbindir}/rcsetserial +%make_install STRIP=: +#UsrMerge +mkdir -p ${RPM_BUILD_ROOT}/bin +ln -sf %{_bindir}/setserial ${RPM_BUILD_ROOT}/bin +#EndUsrMerge %clean rm -rf $RPM_BUILD_ROOT @@ -73,7 +73,9 @@ %defattr(-,root,root) %doc README setserial.lsm rc.serial %doc %{_mandir}/man?/* +%{_bindir}/* +#UsrMerge /bin/* -%{_sbindir}/* +#EndUsrMerge %changelog ++++++ setserial-2.17-binaryInUsr.patch ++++++ --- rc.serial.orig +++ rc.serial @@ -26,12 +26,21 @@ DRIVER_NAME=serial MODULE_REGEXP="serial\b" ALLDEVS="/dev/ttyS?" -if /bin/ls /dev/ttyS?? >& /dev/null ; then +if test -x /usr/bin/ls ; then + LS=/usr/bin/ls +elif test -x /bin/ls ; then + LS=/bin/ls +fi +if $LS /dev/ttyS?? >& /dev/null ; then ALLDEVS="$ALLDEVS /dev/ttyS??" fi SETSERIAL="" -if test -x /bin/setserial ; then +if test -x /usr/bin/setserial ; then + SETSERIAL=/usr/bin/setserial +elif test -x /usr/sbin/setserial ; then + SETSERIAL=/usr/sbin/setserial +elif test -x /bin/setserial ; then SETSERIAL=/bin/setserial elif test -x /sbin/setserial ; then SETSERIAL=/sbin/setserial -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
