rpms/openhpi/devel openhpi-switcher.sh, NONE, 1.1 openhpi.spec, 1.43, 1.44

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 29 14:58:59 UTC 2006


Author: pknirsch

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2198

Modified Files:
	openhpi.spec 
Added Files:
	openhpi-switcher.sh 
Log Message:
- Fixed file conflict bug for openhpi-switcher



--- NEW FILE openhpi-switcher.sh ---
#!/bin/sh
if [ -x /usr/bin/openhpi-switcher.32 ] ; then
  /usr/bin/openhpi-switcher.32
else
  /usr/bin/openhpi-switcher.64
fi


Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- openhpi.spec	12 Jul 2006 07:33:34 -0000	1.43
+++ openhpi.spec	29 Sep 2006 14:58:56 -0000	1.44
@@ -1,11 +1,12 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.4.1
-Release: 5.1
+Release: 6
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
 Source1: openhpi.conf
+Source2: openhpi-switcher.sh
 Patch1: openhpi-2.4.1-werror.patch
 Patch2: openhpi-2.4.1-gcc41.patch
 Patch3: openhpi-2.4.1-memset.patch
@@ -57,6 +58,12 @@
 mkdir -p -m1777 $RPM_BUILD_ROOT%{_var}/lib/openhpi
 make install DESTDIR=$RPM_BUILD_ROOT
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/openhpi
+%ifarch ppc64 x86_64 s390x
+mv -f $RPM_BUILD_ROOT%{_bindir}/openhpi-switcher $RPM_BUILD_ROOT%{_bindir}/openhpi-switcher.64
+%else
+mv -f $RPM_BUILD_ROOT%{_bindir}/openhpi-switcher $RPM_BUILD_ROOT%{_bindir}/openhpi-switcher.32
+%endif
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/openhpi-switcher
 
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/openhpi/*.la
@@ -95,10 +102,12 @@
 
 
 %changelog
+* Fri Sep 29 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-6
+- Fixed file conflicts for openhpi-switcher (#205226)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-5.1
 - rebuild
 
-
 * Mon Jul 10 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-5
 - Had to disable sysfs support due to new libsysfs and incompatible API.
 - Added missing ncurses-devel buildrequires




More information about the fedora-cvs-commits mailing list