Hello community, here is the log from the commit of package iprutils for openSUSE:Factory checked in at 2015-08-05 19:13:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iprutils (Old) and /work/SRC/openSUSE:Factory/.iprutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iprutils" Changes: -------- --- /work/SRC/openSUSE:Factory/iprutils/iprutils.changes 2014-09-19 13:55:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iprutils.new/iprutils.changes 2015-08-05 19:13:37.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Jul 24 10:45:35 UTC 2015 - [email protected] + +- version update to 2.4.8 (FATE#317991) + - see Changelog under iprutils-2.4.8/spec/iprutils.spec + - to prevent failing configure, fetch all cflags + +- added patches: + * iprutils.fix_ncurses_cflags_var.patch + +- removed patches: + * iprconfig.usr-sbin.patch + * iprutils-close.diff + * iprutils.bug-896587_mig_fix_le.patch + * iprutils.generate_ipr_dump_file.patch + * iprutils.install-man.patch + * iprutils.read_intensive_disks_doesnt_show_up.patch + * iprutils.redundant_paths_in_GTO.patch + * iprutils.runlevel.patch + +------------------------------------------------------------------- Old: ---- iprconfig.usr-sbin.patch iprdump.service iprinit.service iprupdate.service iprutils-2.4.1-src.tgz iprutils-close.diff iprutils.bug-896587_mig_fix_le.patch iprutils.generate_ipr_dump_file.patch iprutils.install-man.patch iprutils.read_intensive_disks_doesnt_show_up.patch iprutils.redundant_paths_in_GTO.patch iprutils.runlevel.patch New: ---- iprutils-2.4.8.tar.gz iprutils.fix_ncurses_cflags_var.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iprutils.spec ++++++ --- /var/tmp/diff_new_pack.z2bdjt/_old 2015-08-05 19:13:38.000000000 +0200 +++ /var/tmp/diff_new_pack.z2bdjt/_new 2015-08-05 19:13:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iprutils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,30 +19,22 @@ Name: iprutils # NOTE: package's changelog is hidden in % changelog section # in file iprutils/spec/iprutils.spec -Version: 2.4.1 +Version: 2.4.8 Release: 0 Summary: Utilities for the IBM Power Linux RAID Adapters License: CPL-1.0 Group: Hardware/Other Url: http://sourceforge.net/projects/iprdd/ -Source0: https://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}-src.tgz -Patch0: iprconfig.usr-sbin.patch -Patch1: iprutils.install-man.patch -Patch2: iprutils.runlevel.patch -Patch4: iprutils-close.diff -Patch5: iprutils.redundant_paths_in_GTO.patch -Patch6: iprutils.generate_ipr_dump_file.patch -Patch7: iprutils.read_intensive_disks_doesnt_show_up.patch -Patch8: iprutils.bug-896587_mig_fix_le.patch -Source1: iprdump.service -Source2: iprinit.service -Source3: iprupdate.service +Source0: https://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}.tar.gz +BuildRequires: libncurses5 BuildRequires: ncurses-devel BuildRequires: pciutils-devel BuildRequires: pkg-config +BuildRequires: python BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(glib-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: iprutils.fix_ncurses_cflags_var.patch ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le %arm %systemd_requires @@ -51,29 +43,27 @@ supported by the ipr SCSI storage device driver. %prep -%setup -q -n iprutils +%setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p2 -%patch6 -p2 -%patch7 -p2 -%patch8 -p2 %build -make %{?_smp_mflags} CFLAGS="%{optflags} -I/usr/include/ncurses \$(IPR_DEFINES)" CC="gcc" +export CPPFLAGS="$(ncurses5-config --cflags)" +export LDFLAGS="$(ncurses5-config --libs)" +%configure --sbindir=%{_sbindir} --libdir=%{_libdir} --disable-static +make %install -make INSTALL_MOD_PATH=%{buildroot} install -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/ -install -D -m0644 %{S:2} %{buildroot}%{_unitdir}/ -install -D -m0644 %{S:3} %{buildroot}%{_unitdir}/ +make DESTDIR=%{buildroot} install +install -d $RPM_BUILD_ROOT/%{_unitdir} +cp ./systemd/iprinit.service $RPM_BUILD_ROOT/%{_unitdir}/iprinit.service +cp ./systemd/iprdump.service $RPM_BUILD_ROOT/%{_unitdir}/iprdump.service +cp ./systemd/iprupdate.service $RPM_BUILD_ROOT/%{_unitdir}/iprupdate.service ln -s /sbin/service %{buildroot}/usr/sbin/rciprdump ln -s /sbin/service %{buildroot}/usr/sbin/rciprinit ln -s /sbin/service %{buildroot}/usr/sbin/rciprupdate -echo %{_sbindir} +# get rid of .in files +rm -rf %{buildroot}/%{_datadir}/iprutils +rm -f %{buildroot}/%{_sysconfdir}/ha.d/resource.d/*.in %pre %service_add_pre iprdump.service @@ -98,9 +88,22 @@ %files %defattr(-,root,root,-) %doc README LICENSE -%attr(755,root,root) /sbin/* -%attr(755,root,root) %{_sbindir}/* -%{_mandir}/man*/* -%{_unitdir}/*.service +%{_sbindir}/iprconfig +%{_sbindir}/iprdump +%{_sbindir}/iprupdate +%{_sbindir}/iprinit +%{_sbindir}/iprdbg +%{_sbindir}/iprsos +%{python_sitelib}/sos +%{python_sitelib}/sos/plugins/* +%{_mandir}/man8/* +%{_sysconfdir}/ha.d +%{_sysconfdir}/ha.d/resource.d +%{_sysconfdir}/ha.d/resource.d/iprha +%{_sysconfdir}/bash_completion.d/* +%{_unitdir}/* +%{_sbindir}/rciprdump +%{_sbindir}/rciprinit +%{_sbindir}/rciprupdate %changelog ++++++ iprutils.fix_ncurses_cflags_var.patch ++++++ fetch all flags returned by command Index: iprutils-2.4.8/configure =================================================================== --- iprutils-2.4.8.orig/configure +++ iprutils-2.4.8/configure @@ -11395,8 +11395,8 @@ $as_echo "$am_cv_python_pyexecdir" >&6; -ncurses_include=$(ncurses5-config --cflags) -if test -n ${ncurses_include}; then +ncurses_include="$(ncurses5-config --cflags)" +if test -n "${ncurses_include}"; then CFLAGS="${CFLAGS} ${ncurses_include}" fi Index: iprutils-2.4.8/configure.ac =================================================================== --- iprutils-2.4.8.orig/configure.ac +++ iprutils-2.4.8/configure.ac @@ -19,8 +19,8 @@ AC_PROG_INSTALL LT_INIT AM_PATH_PYTHON([2.6]) -ncurses_include=$(ncurses5-config --cflags) -if test -n ${ncurses_include}; then +ncurses_include="$(ncurses5-config --cflags)" +if test -n "${ncurses_include}"; then CFLAGS="${CFLAGS} ${ncurses_include}" fi
