dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: OpenIPMI
-# $Id$
-NAME := OpenIPMI
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

OpenIPMI.spec

@@ -2,21 +2,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
-Version: 2.0.13
-Release: 2%{?dist}
+Version: 2.0.14
+Release: 2.1%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
-Source: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
-Source2: http://prdownloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz
+Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
+Source2: http://downloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz
 Source3: openipmi.sysconf
 Source4: openipmi.initscript
 Patch100: ipmitool-1.8.9-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-PreReq: chkconfig
-BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
-BuildPrereq: openssl-devel python-devel readline-devel popt-devel
-BuildPrereq: perl-devel
+BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
+BuildRequires: openssl-devel python-devel readline-devel popt-devel
+BuildRequires: perl-devel chrpath
+Requires(post): chkconfig
+Requires(preun): chkconfig
 
 %description
 The Open IPMI project aims to develop an open code base to allow access to
@@ -42,6 +43,7 @@ ipmitool project.
 %package perl
 Group: Development/Libraries
 Summary: OpenIPMI Perl language bindings
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI.
@@ -55,7 +57,8 @@ The OpenIPMI-perl package contains the Python language bindings for OpenIPMI.
 
 %package devel
 Group: Development/Libraries
-Summary: The development environment for the OpenIPMI project.
+Summary: The development environment for the OpenIPMI project
+Requires: pkgconfig
 Requires: %{name} = %{version}
 
 %description devel
@@ -66,9 +69,16 @@ of the OpenIPMI project.
 %setup -q -a 2
 pushd ipmitool-%{ipmitoolver}
 %patch100 -p1 -b .open
+for f in AUTHORS ChangeLog; do
+    iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
+    mv ${f}.utf8 ${f}
+done
+popd
 
 %build
+export CFLAGS=-fPIC
 %configure --with-pythoninstall=%{python_sitearch}
+sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
 make
 pushd ipmitool-%{ipmitoolver}
 %configure
@@ -76,12 +86,15 @@ make
 popd
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 # Remove python cruft in 32bit libdir on 64bit archs...
 %ifarch ppc64 s390x x86_64
 rm -rf $RPM_BUILD_ROOT/usr/lib
 %endif
+# Remove rpaths from libOpenIPMIposix.so.0.0.1
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libOpenIPMIposix.so.0.0.1
 pushd ipmitool-%{ipmitoolver}
 make install DESTDIR=$RPM_BUILD_ROOT
 #rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/
@@ -116,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/ipmi
-%config %{_initrddir}/ipmi
+%{_initrddir}/ipmi
 %{_bindir}/ipmicmd
 %{_bindir}/ipmilan
 %{_bindir}/ipmish
@@ -136,11 +149,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ipmilan*
 
 %files perl
-%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/OpenIPMI.pm
-%dir %{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/OpenIPMI
-%{_libdir}/perl5/vendor_perl/*/*-linux-thread-multi/auto/OpenIPMI/*
+%defattr(-,root,root)
+%attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm
+%{perl_vendorarch}/auto/OpenIPMI/
 
 %files python
+%defattr(-,root,root)
 %{_libdir}/python*/site-packages/*
 
 %files tools
@@ -154,7 +168,6 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_libdir}/pkgconfig/*
 
 %files devel
 %defattr(-,root,root)
@@ -162,8 +175,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/OpenIPMI
 %{_libdir}/*.so
 %{_libdir}/*.a
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 01 2008 Phil Knirsch <pknirsch@redhat.com> - 2.0.14-2.1
+- Build for F-9
+- Fix perl linking problem
+
+* Wed Jul 30 2008 Phil Knirsch <pknirsch@redhat.com> - 2.0.14-2
+- Fixed rpath problem in libOpenIPMIposix.so.0.0.1
+
+* Tue Jul 29 2008 Phil Knirsch <pknirsch@redhat.com> - 2.0.14-1
+- Fixed several specfile problems (#453751)
+- Update to OpenIPMI-2.0.14
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.13-2
 - Autorebuild for GCC 4.3
 

sources

@@ -1,2 +1,2 @@
+f766680bb237ca2f837c005efba54efa  OpenIPMI-2.0.14.tar.gz
 3b4dbdbaa1edff3dccaf88d161b34cd2  ipmitool-1.8.9.tar.gz
-41835d4a2db684b9fca66e954c18c348  OpenIPMI-2.0.13.tar.gz