rpms/pvm/F-8 pvm-arch.patch, NONE, 1.1 pvm.spec, 1.38, 1.39 sources, 1.5, 1.6 pvmd.init, 1.2, NONE
Doug Ledford (dledford)
fedora-extras-commits at redhat.com
Tue Jun 24 18:44:43 UTC 2008
Author: dledford
Update of /cvs/extras/rpms/pvm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2717
Modified Files:
pvm.spec sources
Added Files:
pvm-arch.patch
Removed Files:
pvmd.init
Log Message:
* Tue Jun 24 2008 Doug Ledford <dledford at redhat.com> - 3.4.5-11
- spec file cleanups
- add arch patch that fixes upgrade issues caused by arch definition change
in a minor point release
pvm-arch.patch:
--- NEW FILE pvm-arch.patch ---
--- pvm3/lib/pvmgetarch.arch 2008-06-20 12:11:42.000000000 -0400
+++ pvm3/lib/pvmgetarch 2008-06-20 12:11:42.000000000 -0400
@@ -67,9 +67,9 @@ if [ -f /bin/uname -o -f /usr/bin/uname
*,88k ) ARCH=E88K ;;
*,mips ) ARCH=MIPS ;;
*,CRAY-2 ) ARCH=CRAY2 ;;
- Linux,i[3456]86 ) ARCH=LINUX ;;
- Linux,ia64 ) ARCH=LINUX64 ;;
- Linux,x86_64 ) ARCH=LINUX64 ;;
+ Linux,i[3456]86 ) ARCH=LINUXI386 ;;
+ Linux,ia64 ) ARCH=LINUXIA64 ;;
+ Linux,x86_64 ) ARCH=LINUXX86_64 ;;
Linux,alpha ) ARCH=LINUXALPHA ;;
Linux,arm* ) ARCH=LINUXARM ;;
Linux,sparc* ) ARCH=LINUXSPARC ;;
--- pvm3/lib/debugger2.arch 2008-06-20 12:12:01.000000000 -0400
+++ pvm3/lib/debugger2 2008-06-20 12:12:50.000000000 -0400
@@ -46,8 +46,13 @@ case TITN:
set DBFF=""
breaksw
-case LINUX:
-case LINUX64:
+case LINUXI386:
+case LINUXX86_64:
+case LINUXIA64:
+case LINUXPPC:
+case LINUXPPC64:
+case LINUXS390:
+case LINUXS390X:
case LINUXALPHA:
case LINUXHPPA:
case LINUXSPARC:
--- pvm3/xpvm/src/xpvm.tcl.arch 1998-04-09 17:12:32.000000000 -0400
+++ pvm3/xpvm/src/xpvm.tcl 2008-06-20 12:14:51.000000000 -0400
@@ -494,6 +494,14 @@ define_arch HPPA "$xbm_dir/hppa.xbm"
define_arch I860 "$xbm_dir/i860.xbm"
define_arch IPSC2 "$xbm_dir/ipsc2.xbm"
define_arch LINUX "$xbm_dir/linux.xbm"
+define_arch LINUX64 "$xbm_dir/linux.xbm"
+define_arch LINUXI386 "$xbm_dir/linux.xbm"
+define_arch LINUXX86_64 "$xbm_dir/linux.xbm"
+define_arch LINUXIA64 "$xbm_dir/linux.xbm"
+define_arch LINUXPPC "$xbm_dir/linux.xbm"
+define_arch LINUXPPC64 "$xbm_dir/linux.xbm"
+define_arch LINUXS390 "$xbm_dir/linux.xbm"
+define_arch LINUXS390X "$xbm_dir/linux.xbm"
define_arch LINUXSPARC "$xbm_dir/linuxsparc.xbm"
define_arch LINUXALPHA "$xbm_dir/linuxalpha.xbm"
define_arch KSR1 "$xbm_dir/ksr1.xbm"
Index: pvm.spec
===================================================================
RCS file: /cvs/extras/rpms/pvm/F-8/pvm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pvm.spec 12 Jul 2006 07:54:13 -0000 1.38
+++ pvm.spec 24 Jun 2008 18:43:57 -0000 1.39
@@ -1,19 +1,15 @@
Summary: Libraries for distributed computing.
Name: pvm
Version: 3.4.5
-Release: 7.fc6.1
-License: freely distributable
+Release: 11%{?dist}
+# Includes regex code which is under GPLv2+
+License: MIT and GPLv2+
Group: Development/Libraries
Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
Source1: http://www.netlib.org/pvm3/xpvm/XPVM.src.1.2.5.tgz
Source2: xpvm.sh
-Source3: pvmd.init
-Source4: pvm.sh
-#Source5: pvm_init.sh
-#Source6: pvm_init.csh
-#Source7: xpvm_init.sh
-#Source8: xpvm_init.csh
-Source9: README.RedHat
+Source3: pvm.sh
+Source4: README.RedHat
Patch0: xpvm-tcltk.patch
Patch1: pvm3-vaargfix.patch
Patch2: pvm-s390.patch
@@ -24,6 +20,7 @@
Patch7: pvm-3.4.5-bug_147337.patch
Patch8: pvm-3.4.5-Pvmtev.patch
Patch9: pvm-3.4.5-ppc64arch.patch
+Patch10: pvm-arch.patch
URL: http://www.epm.ornl.gov/pvm/pvm_home.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: initscripts >= 5.54, bash >= 2
@@ -46,7 +43,7 @@
%prep
%setup -q -T -c -n pvm
-cp %SOURCE9 .
+cp %SOURCE4 .
chmod 0644 README.RedHat
rm -rf $RPM_BUILD_ROOT
@@ -64,6 +61,8 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
+find . -name \*.orig | xargs rm -f
# Patch the LINUX*64.def files to look in lib64 dirs as well for libraries.
perl -p -i -e "s|ARCHDLIB[ \ ]*=|ARCHDLIB = -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX64.def
@@ -110,9 +109,6 @@
XPVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3/xpvm \
make -C $RPM_BUILD_ROOT/usr/share/pvm3/xpvm install
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 0755 $RPM_SOURCE_DIR/pvmd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/pvmd
-
mkdir -p $RPM_BUILD_ROOT/usr/bin
install -m 0755 $RPM_SOURCE_DIR/pvm.sh $RPM_BUILD_ROOT/usr/bin/pvm
@@ -135,7 +131,6 @@
grep -v "xpvm" | \
grep -v "example" | \
grep -v "conf/" | \
- grep -v "etc/rc.d/init.d" | \
grep -v "\.o$" > files.list
find $RPM_BUILD_ROOT -type f -o -type l | \
sed -e "s|$RPM_BUILD_ROOT||g" | \
@@ -151,13 +146,6 @@
grep -v "%{_mandir}" files.list > files.list2
mv files.list2 files.list
-#install init files
-#mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-#install -m 755 %SOURCE5 $RPM_BUILD_ROOT/etc/profile.d/pvm.sh
-#install -m 755 %SOURCE6 $RPM_BUILD_ROOT/etc/profile.d/pvm.csh
-#install -m 755 %SOURCE7 $RPM_BUILD_ROOT/etc/profile.d/xpvm.sh
-#install -m 755 %SOURCE8 $RPM_BUILD_ROOT/etc/profile.d/xpvm.csh
-
#Fix broken man pages
pushd $RPM_BUILD_ROOT/%{_mandir}
rm man1/PVM.1 man1/pvmd.1
@@ -166,7 +154,6 @@
popd
# remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/rc.d
rm -f $RPM_BUILD_ROOT%{_datadir}/pvm3/Readme.Win32
rm -f `find $RPM_BUILD_ROOT -name "*.o"`
rm -rf $RPM_BUILD_ROOT%{_datadir}/pvm3/WIN32/*
@@ -186,45 +173,51 @@
rm -f files.list
%pre
-/usr/sbin/groupadd -g 24 -r -f pvm > /dev/null 2>&1 ||:
-/usr/sbin/useradd -u 24 -g 24 -d /usr/share/pvm3 -r -s /bin/bash pvm > /dev/null 2>&1 ||:
-
-#preun
-#if [ $1 -eq 0 ]; then
-# /sbin/chkconfig --del pvmd
-#fi
-
-#post
-#/sbin/chkconfig --add pvmd
-
-#postun
-# [ $1 -ge 1 ]; then
-# service pvmd condrestart >/dev/null 2>&1
-#fi
-#if [ $1 = 0 ] ; then
-# /usr/sbin/userdel pvm > /dev/null 2>&1
-#fi
+if [ $1 -eq 1 ]; then
+ /usr/sbin/groupadd -g 24 -r -f pvm > /dev/null 2>&1
+ /usr/sbin/useradd -u 24 -g 24 -d /usr/share/pvm3 -r -s /bin/bash pvm > /dev/null 2>&1 ||:
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+ /usr/sbin/userdel pvm > /dev/null 2>&1
+ /usr/sbin/groupdel pvm > /dev/null 2>&1 ||:
+fi
%triggerun -- pvm <= 3.4.3-25
/sbin/chkconfig --del pvmd
-#config /etc/rc.d/init.d/pvmd
%files -f files.list
%defattr(-,root,root)
%doc arches bugreport example.pvmrc release-notes README.RedHat
%{_mandir}/*/*
-#%config /etc/profile.d/pvm*
%dir %attr(755,pvm,pvm) /var/run/pvm3
%files gui
%defattr(-,root,root)
%dir /usr/share/pvm3/xpvm
-#%config /etc/profile.d/xpvm*
/usr/share/pvm3/bin/*/xpvm
/usr/bin/xpvm
/usr/share/pvm3/xpvm/*
%changelog
+* Tue Jun 24 2008 Doug Ledford <dledford at redhat.com> - 3.4.5-11
+- spec file cleanups
+- add arch patch that fixes upgrade issues caused by arch definition change
+ in a minor point release
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com - 3.4.5-10
+- fix license tag
+
+* Sat Feb 9 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.4.5-9
+- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
+
+* Tue Jan 08 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.4.5-8
+- rebuild for new Tcl 8.5
+- apply patch from Florian La Roche <laroche at redhat.com> (#427964)
+- do not package *.orig patch files
+- use dist macro
+
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4.5-7.fc6.1
- rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pvm/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 2 Feb 2005 20:30:25 -0000 1.5
+++ sources 24 Jun 2008 18:43:57 -0000 1.6
@@ -1,3 +1,2 @@
7b20143cb2ff61e3cb28baf8f9cb2770 XPVM.src.1.2.5.tgz
-806abe9a866eab5981383c17ff9ed175 pvm3.4.4.tgz
086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz
--- pvmd.init DELETED ---
More information about the fedora-extras-commits
mailing list