diff --git a/.cvsignore b/.cvsignore index b102b7c..abe9e43 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -powerpc-utils-1.1.3.tar.gz +powerpc-utils-1.2.0.tar.gz diff --git a/powerpc-utils-1.2.0-chkconfig.patch b/powerpc-utils-1.2.0-chkconfig.patch new file mode 100644 index 0000000..0f400ff --- /dev/null +++ b/powerpc-utils-1.2.0-chkconfig.patch @@ -0,0 +1,20 @@ +diff -up powerpc-utils/scripts/ibmvscsis.sh.chkconfig powerpc-utils/scripts/ibmvscsis.sh +--- powerpc-utils/scripts/ibmvscsis.sh.chkconfig 2009-07-30 19:06:07.000000000 -0400 ++++ powerpc-utils/scripts/ibmvscsis.sh 2009-08-20 11:29:29.000000000 -0400 +@@ -2,6 +2,7 @@ + + # IBM "ibmvscsis.sh": ibmvscsis init script + # ++# chkconfig: 35 50 50 + # Copyright (c) 2004, 2005 International Business Machines. + # Common Public License Version 1.0 (see COPYRIGHT) + # +@@ -20,7 +21,7 @@ + # Required-Stop: $syslog $remote_fs + # Should-Stop: + # Default-Start: 3 5 +-# Default-Stop: ++# Default-Stop: 0 1 2 4 6 + # Short-Description: configure this partition as virtual scsi server + # Description: Based on /etc/ibmvscsis.conf, this partition + # will export configured drives, partitions or loop mounted diff --git a/powerpc-utils.spec b/powerpc-utils.spec index 7d9a392..db2080d 100644 --- a/powerpc-utils.spec +++ b/powerpc-utils.spec @@ -1,6 +1,8 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} +%{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")} Name: powerpc-utils -Version: 1.1.3 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Utilities for PowerPC platforms Group: System Environment/Base @@ -9,31 +11,53 @@ URL: http://powerpc-utils.ozlabs.org/ Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{version}.tar.gz Source1: nvsetenv BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen +BuildRequires: doxygen automake python python-devel librtas-devel libservicelog-devel >= 1.0.1-2 + +# should be fixed - libservicelog is not right name +Requires: libservicelog ExclusiveArch: ppc ppc64 +Patch1: powerpc-utils-1.2.0-chkconfig.patch + +# This is done before release of F12 +Obsoletes: powerpc-utils-papr < 1.1.6-3 +Provides: powerpc-utils-papr = 1.1.6-3 + %description Utilities for PowerPC platforms. %prep -%setup -q -sed -i s/744/755/ rules.mk +%setup -q -n %{name} +%patch1 -p1 -b .chkconfig %build +./bootstrap.sh +./configure --prefix=/usr make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT FILES= +make install DESTDIR=$RPM_BUILD_ROOT FILES= RCSCRIPTS= install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/nvsetenv +%define pkgdocdir %{_datadir}/doc/%{name}-%{version} +# move doc files +mkdir -p $RPM_BUILD_ROOT%{pkgdocdir} +install $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils/* -t $RPM_BUILD_ROOT%{pkgdocdir} +rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils + +# move init script +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d +install -m 755 $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ibmvscsisd +rm -rf $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh + %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root) %{_sbindir}/nvsetenv %{_sbindir}/nvram %{_sbindir}/snap @@ -45,11 +69,64 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/snap.8.gz %{_mandir}/man8/bootlist.8.gz %{_mandir}/man8/ofpathname.8.gz + +%{_sysconfdir}/rc.d/init.d/ibmvscsisd + +%{_sbindir}/update_flash +%{_sbindir}/activate_firmware +%{_sbindir}/usysident +%{_sbindir}/usysattn +%{_sbindir}/set_poweron_time +%{_sbindir}/rtas_ibm_get_vpd +%{_sbindir}/serv_config +%{_sbindir}/uesensor +%{_sbindir}/hvcsadmin +%{_sbindir}/vscsisadmin +%{_sbindir}/rtas_dump +%{_sbindir}/rtas_event_decode +%{_sbindir}/sys_ident +%{_sbindir}/drmgr +%{_sbindir}/lsslot +%{_bindir}/amsvis +%{_bindir}/amsstat +%{_mandir}/man8/update_flash.8.gz +%{_mandir}/man8/activate_firmware.8.gz +%{_mandir}/man8/usysident.8.gz +%{_mandir}/man8/usysattn.8.gz +%{_mandir}/man8/set_poweron_time.8.gz +%{_mandir}/man8/rtas_ibm_get_vpd.8.gz +%{_mandir}/man8/serv_config.8.gz +%{_mandir}/man8/uesensor.8.gz +%{_mandir}/man8/hvcsadmin.8.gz +%{_mandir}/man8/vscsisadmin.8.gz +%{_mandir}/man8/ibmvscsis.sh.8.gz +%{_mandir}/man8/ibmvscsis.conf.8.gz +%{_mandir}/man8/rtas_dump.8.gz +%{_mandir}/man8/sys_ident.8.gz +%{_mandir}/man1/amsvis.1.gz +%{_mandir}/man1/amsstat.1.gz %doc README COPYRIGHT Changelog +# pythonies +%{python_sitelib}/powerpcAMS-%{version}-py%{python_version}.egg-info +%{python_sitelib}/powerpcAMS/__init__.py* +%{python_sitelib}/powerpcAMS/amsdata.py* +%{python_sitelib}/powerpcAMS/amsnet.py* +%{python_sitelib}/powerpcAMS/amswidget.py* +%post +/sbin/chkconfig --add ibmvscsisd + +%preun +if [ $1 = 0 ] ; then + /sbin/service ibmvscsisd stop >/dev/null 2>&1 + /sbin/chkconfig --del ibmvscsisd +fi %changelog +* Mon Aug 17 2009 Roman Rakus - 1.2.0-1 +- Bump tu version 1.2.0 - powerpc-utils and powerpc-utils-papr get merged + * Sun Jul 26 2009 Fedora Release Engineering - 1.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index e03545f..c5f5264 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36c254e48941b177242118c51539421c powerpc-utils-1.1.3.tar.gz +6a79a185421aa6f88d163124073ffae0 powerpc-utils-1.2.0.tar.gz