diff --git a/.gitignore b/.gitignore index aa54d0c..34f7e85 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ open-isns-0.93.tar.bz2 +/open-isns-0.94.tar.gz diff --git a/isns-utils.spec b/isns-utils.spec index 5f344e0..0650438 100644 --- a/isns-utils.spec +++ b/isns-utils.spec @@ -1,12 +1,12 @@ Name: isns-utils -Version: 0.93 -Release: 8%{?dist} +Version: 0.94 +Release: 1%{?dist} Summary: The iSNS daemon and utility programs Group: System Environment/Daemons License: LGPLv2+ -URL: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns -Source0: http://www.kernel.org/pub/linux/kernel/people/mnc/open-isns/releases/open-isns-%{version}.tar.bz2 +URL: https://github.com/gonzoleeman/open-isns +Source0: https://github.com/gonzoleeman/open-isns/archive/%{version}.tar.gz#/open-isns-%{version}.tar.gz Source1: isnsd.service BuildRequires: openssl-devel automake pkgconfig systemd-devel systemd @@ -21,40 +21,29 @@ and iSNS client tools. The Internet Storage Name Service (iSNS) protocol allows automated discovery, management and configuration of iSCSI and Fibre Channel devices (using iFCP gateways) on a TCP/IP network. + +%package devel +Group: Development/Libraries +Summary: Development files for iSNS + +%description devel +Development files for iSNS + + %prep %setup -q -n open-isns-%{version} %build -if pkg-config openssl ; then - CPPFLAGS=$(pkg-config --cflags openssl) ; export CPPFLAGS - LDFLAGS=$(pkg-config --libs openssl) ; export LDFLAGS -fi - -autoconf -autoheader %configure -sed -i -e 's|-Wall -g -O2|%{optflags}|' Makefile make %{?_smp_mflags} %install -install -d %{buildroot}%{_sbindir} -install -d %{buildroot}%{_mandir}/man8 -install -d %{buildroot}%{_mandir}/man5 -install -d %{buildroot}%{_unitdir} -install -d %{buildroot}%{_sysconfdir}/isns -install -d %{buildroot}%{_var}/lib -install -d %{buildroot}%{_var}/lib/isns - -install -p -m 644 etc/isnsd.conf %{buildroot}%{_sysconfdir}/isns/isnsd.conf -install -p -m 644 etc/isnsdd.conf %{buildroot}%{_sysconfdir}/isns/isnsdd.conf -install -p -m 644 etc/isnsadm.conf %{buildroot}%{_sysconfdir}/isns/isnsadm.conf - -install -p -m 755 isnsd isnsdd isnsadm isnssetup %{buildroot}%{_sbindir} -install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service -install -p -m 644 doc/isns_config.5 %{buildroot}/%{_mandir}/man5/ -install -p -m 644 doc/isnsd.8 doc/isnsdd.8 doc/isnsadm.8 %{buildroot}/%{_mandir}/man8/ +sed -i -e 's|-m 555|-m 755|' Makefile +make install DESTDIR=%{buildroot} +make install_hdrs DESTDIR=%{buildroot} +make install_lib DESTDIR=%{buildroot} %post @@ -81,19 +70,30 @@ install -p -m 644 doc/isnsd.8 doc/isnsdd.8 doc/isnsadm.8 %{buildroot}/%{_mandir} %files +%defattr(-,root,root,-) %doc COPYING README %{_sbindir}/isnsd %{_sbindir}/isnsadm %{_sbindir}/isnsdd -%{_sbindir}/isnssetup %{_mandir}/man8/* -%{_mandir}/man5/* %{_unitdir}/isnsd.service %dir %{_sysconfdir}/isns %dir %{_var}/lib/isns %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/* + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/libisns +%{_includedir}/libisns/*.h +%{_libdir}/libisns.a + + %changelog +* Mon Oct 05 2015 Chris Leech - 0.94-1 +- new upstream location, update to 0.94 +- new devel package, upstream open-iscsi is dropping it's internal copy + * Wed Jun 17 2015 Chris Leech - 0.93-8 - use of systemd rpm macros now require systemd as a BuildRequires diff --git a/sources b/sources index 321754a..213c0c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d89a574090e79073181f0ddf7c6eea04 open-isns-0.93.tar.bz2 +a51815a11a1af0ec237b4fd01a9ff3f3 open-isns-0.94.tar.gz