From 6fa2abb922460a7a348a3de2b52db57bf8183ec577bdbb3f280b9d8baf9eafeb Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 8 May 2012 08:34:30 +0000 Subject: [PATCH] - Fix build: Added version 1.1.4 tarball - Adjust specfile according to spec-cleaner as suggested by Sascha Peilicke to get this package into factory. OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/freeipmi?expand=0&rev=6 --- freeipmi-1.1.3.tar.gz | 3 -- freeipmi-1.1.4.tar.gz | 3 ++ freeipmi.changes | 7 ++++ freeipmi.spec | 88 ++++++++++++++++++++++--------------------- 4 files changed, 56 insertions(+), 45 deletions(-) delete mode 100644 freeipmi-1.1.3.tar.gz create mode 100644 freeipmi-1.1.4.tar.gz diff --git a/freeipmi-1.1.3.tar.gz b/freeipmi-1.1.3.tar.gz deleted file mode 100644 index ac4c8bf..0000000 --- a/freeipmi-1.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b34e273b72ad7c4fc7a8b6c9a79e60f95af51fd6a13658f078e932347fe76a86 -size 3055789 diff --git a/freeipmi-1.1.4.tar.gz b/freeipmi-1.1.4.tar.gz new file mode 100644 index 0000000..2c8c4bf --- /dev/null +++ b/freeipmi-1.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cbd2581d52ddb9b791ec6691215176ed010ae79b909a93026fef6b1fb0a4178 +size 3068549 diff --git a/freeipmi.changes b/freeipmi.changes index 3efdd6a..dc72f9f 100644 --- a/freeipmi.changes +++ b/freeipmi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 8 08:18:31 UTC 2012 - trenn@suse.de + +- Fix build: Added version 1.1.4 tarball +- Adjust specfile according to spec-cleaner as suggested by Sascha Peilicke + to get this package into factory. + ------------------------------------------------------------------- Fri Apr 20 06:42:25 UTC 2012 - kkaempf@suse.com diff --git a/freeipmi.spec b/freeipmi.spec index 97c6a00..a736784 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -29,19 +29,24 @@ Name: %{name} Version: %{version} Release: %{release} License: GPL-3.0+ -Group: Applications/System Url: http://www.gnu.org/software/freeipmi/ +Group: Applications/System Source: ftp://ftp.gnu.org/gnu/freeipmi/%{name}-%{version}.tar.gz +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: add_default_start.patch +Summary: FreeIPMI +BuildRequires: automake +BuildRequires: libgcrypt-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: texinfo +Obsoletes: freeipmi-ipmimonitoring BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake libgcrypt-devel libtool pkg-config texinfo Requires(post): info Requires(preun): info -Obsoletes: freeipmi-ipmimonitoring # Necessary as only those archs implement iopl and friends (#368541) ExclusiveArch: %{ix86} x86_64 ia64 alpha -Summary: FreeIPMI %description This project provides "Remote-Console" (out-of-band) and @@ -51,7 +56,7 @@ Platform Management Interface specification. %package devel Summary: Development package for FreeIPMI Group: Development/System -Requires: freeipmi = %{version}-%{release} +Requires: freeipmi = %{version} %description devel Development package for FreeIPMI. This package includes the FreeIPMI @@ -61,9 +66,9 @@ header files and static libraries. Summary: FreeIPMI BMC watchdog Group: Applications/System %if 0%{?suse_version} -PreReq: %fillup_prereq +Requires(pre): %fillup_prereq %endif -Requires: freeipmi = %{version}-%{release} +Requires: freeipmi = %{version} %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} Requires(post): chkconfig Requires(preun): chkconfig @@ -76,7 +81,7 @@ Provides a watchdog daemon for OS monitoring and recovery. %package ipmidetectd Summary: IPMI node detection monitoring daemon Group: Applications/System -Requires: freeipmi = %{version}-%{release} +Requires: freeipmi = %{version} %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} Requires(post): chkconfig Requires(preun): chkconfig @@ -100,30 +105,29 @@ libtoolize --force --automake --copy automake --gnu --include-deps --copy --add-missing autoconf %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ - --docdir=%{_docdir}/%name \ + --docdir=%{_docdir}/%{name} \ %{?_enable_debug} --disable-static -CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} +CFLAGS="%{optflags}" make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT +mkdir -p %{buildroot} %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} # /etc/rc.d/init.d -mkdir -p $RPM_BUILD_ROOT/%{_initrddir} +mkdir -p %{buildroot}/%{_initddir} # 'make install' installs to /etc/init.d # /etc/init.d -> /etc/rc.d/init.d -(cd $RPM_BUILD_ROOT/%{_sysconfdir}; ln -s rc.d/init.d init.d) +(cd %{buildroot}/%{_sysconfdir}; ln -s rc.d/init.d init.d) %endif -DESTDIR="$RPM_BUILD_ROOT" make install +%make_install # Silent build check warning -rm $RPM_BUILD_ROOT/usr/share/doc/packages/freeipmi/INSTALL +rm %{buildroot}%{_datadir}/doc/packages/freeipmi/INSTALL %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} # remove /etc/init.d -> /etc/rc.d/init.d -(cd $RPM_BUILD_ROOT/%{_sysconfdir}; rm init.d) +(cd %{buildroot}/%{_sysconfdir}; rm init.d) %endif # fix coherance problems with associated script filenames @@ -131,15 +135,15 @@ rm -f %{buildroot}%{_infodir}/dir # kludge to get around rpmlint complaining about 0 length semephore file echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey # Remove .la files -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -rf %{buildroot}/%{_libdir}/*.la %if 0%{?suse_version} -mkdir -p %{buildroot}/var/adm/fillup-templates -mv %{buildroot}%{_sysconfdir}/sysconfig/bmc-watchdog %{buildroot}/var/adm/fillup-templates/sysconfig.bmc-watchdog +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mv %{buildroot}%{_sysconfdir}/sysconfig/bmc-watchdog %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.bmc-watchdog %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post if [ -x /sbin/install-info ]; then @@ -163,29 +167,29 @@ fi %{fillup_only} %endif if [ "$1" = 1 ]; then - if [ -x %{_initrddir}/bmc-watchdog ]; then + if [ -x %{_initddir}/bmc-watchdog ]; then /sbin/chkconfig --add bmc-watchdog /sbin/chkconfig bmc-watchdog off fi fi if [ $1 -ge 1 ]; then - if [ -x %{_initrddir}/bmc-watchdog ]; then - if %{_initrddir}/bmc-watchdog status | grep -q running; then - %{_initrddir}/bmc-watchdog restart + if [ -x %{_initddir}/bmc-watchdog ]; then + if %{_initddir}/bmc-watchdog status | grep -q running; then + %{_initddir}/bmc-watchdog restart else - %{_initrddir}/bmc-watchdog condrestart + %{_initddir}/bmc-watchdog condrestart fi fi fi %preun bmc-watchdog # -# Stop bmc-watchdog if it is running +# Stop bmc-watchdog if it is running # if [ "$1" = 0 ]; then - if [ -x %{_initrddir}/bmc-watchdog ]; then - if %{_initrddir}/bmc-watchdog status | grep -q running; then - %{_initrddir}/bmc-watchdog stop + if [ -x %{_initddir}/bmc-watchdog ]; then + if %{_initddir}/bmc-watchdog status | grep -q running; then + %{_initddir}/bmc-watchdog stop fi /sbin/chkconfig --del bmc-watchdog fi @@ -193,29 +197,29 @@ fi %post ipmidetectd if [ "$1" = 1 ]; then - if [ -x %{_initrddir}/ipmidetectd ]; then + if [ -x %{_initddir}/ipmidetectd ]; then /sbin/chkconfig --add ipmidetectd /sbin/chkconfig ipmidetectd off fi fi if [ $1 -ge 1 ]; then - if [ -x %{_initrddir}/ipmidetectd ]; then - if %{_initrddir}/ipmidetectd status | grep -q running; then - %{_initrddir}/ipmidetectd restart + if [ -x %{_initddir}/ipmidetectd ]; then + if %{_initddir}/ipmidetectd status | grep -q running; then + %{_initddir}/ipmidetectd restart else - %{_initrddir}/ipmidetectd condrestart + %{_initddir}/ipmidetectd condrestart fi fi fi %preun ipmidetectd # -# Stop ipmidetectd if it is running +# Stop ipmidetectd if it is running # if [ "$1" = 0 ]; then - if [ -x %{_initrddir}/ipmidetectd ]; then - if %{_initrddir}/ipmidetectd status | grep -q running; then - %{_initrddir}/ipmidetectd stop + if [ -x %{_initddir}/ipmidetectd ]; then + if %{_initddir}/ipmidetectd status | grep -q running; then + %{_initddir}/ipmidetectd stop fi /sbin/chkconfig --del ipmidetectd fi @@ -401,9 +405,9 @@ fi %doc COPYING.bmc-watchdog %doc DISCLAIMER.bmc-watchdog %doc DISCLAIMER.bmc-watchdog.UC -%config(noreplace) %{_initrddir}/bmc-watchdog +%config(noreplace) %{_initddir}/bmc-watchdog %if 0%{?suse_version} -%attr(0444,root,root) %config(noreplace) /var/adm/fillup-templates/sysconfig.bmc-watchdog +%attr(0444,root,root) %config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.bmc-watchdog %else %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/bmc-watchdog %endif @@ -414,7 +418,7 @@ fi %files ipmidetectd %defattr(-,root,root) -%config(noreplace) %{_initrddir}/ipmidetectd +%config(noreplace) %{_initddir}/ipmidetectd %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/ipmidetectd.conf %{_sbindir}/ipmidetectd %{_mandir}/man5/ipmidetectd.conf.5*