diff --git a/SPECS/isns-utils.spec b/SPECS/isns-utils.spec index 72ee9376..45022b5d 100644 --- a/SPECS/isns-utils.spec +++ b/SPECS/isns-utils.spec @@ -1,22 +1,19 @@ Name: isns-utils -Version: 0.93 -Release: 7%{?dist} +Version: 0.97 +Release: 6%{?dist} Summary: The iSNS daemon and utility programs Group: System Environment/Daemons License: LGPLv2+ -URL: https://github.com/mikechristie/open-isns -Source0: https://github.com/cleech/open-isns/releases/download/v0.93/open-isns-%{version}.tar.bz2 +URL: https://github.com/open-iscsi/open-isns +Source0: https://github.com/open-iscsi/open-isns/archive/v%{version}.tar.gz#/open-isns-%{version}.tar.gz Source1: isnsd.service -Patch1: 0001-use-LDFLAGS.patch - -BuildRequires: openssl-devel automake pkgconfig systemd +BuildRequires: openssl-devel automake pkgconfig systemd-devel systemd Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -%global _hardened_build 1 %description The iSNS package contains the daemon and tools to setup a iSNS server, @@ -24,36 +21,40 @@ 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 libs +Group: Development/Libraries +Summary: Shared library files for iSNS + +%description libs +Shared library files for iSNS + +%package devel +Group: Development/Libraries +Summary: Development files for iSNS +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +Development files for iSNS + + %prep %setup -q -n open-isns-%{version} -%patch1 -p1 %build -autoconf -autoheader -%{configure} -%{__sed} -i -e 's|-Wall -g -O2|%{optflags}|' Makefile -%{__make} %{?_smp_mflags} +%configure --enable-shared --disable-static +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/ +make install DESTDIR=%{buildroot} +make install_hdrs DESTDIR=%{buildroot} +make install_lib DESTDIR=%{buildroot} +chmod 755 %{buildroot}%{_sbindir}/isns* +chmod 755 %{buildroot}%{_libdir}/libisns.so.0 +rm %{buildroot}%{_unitdir}/isnsd.service +rm %{buildroot}%{_unitdir}/isnsd.socket +install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/isnsd.service %post @@ -79,38 +80,82 @@ autoheader /bin/systemctl try-restart isnsd.service >/dev/null 2>&1 || : -%clean -%{__rm} -rf %{buildroot} +%post -n %{name}-libs -p /sbin/ldconfig + +%postun -n %{name}-libs -p /sbin/ldconfig + %files +%defattr(-,root,root,-) %doc COPYING README %{_sbindir}/isnsd %{_sbindir}/isnsadm %{_sbindir}/isnsdd -%{_sbindir}/isnssetup -%{_mandir}/man8/* %{_mandir}/man5/* +%{_mandir}/man8/* %{_unitdir}/isnsd.service %dir %{_sysconfdir}/isns %dir %{_var}/lib/isns -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/isns/* +%config(noreplace) %{_sysconfdir}/isns/* + +%files libs +%defattr(-,root,root,-) +%{_libdir}/libisns.so.0 + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/libisns +%{_includedir}/libisns/*.h +%{_libdir}/libisns.so + %changelog -* Fri Jan 24 2014 Daniel Mach - 0.93-7 -- Mass rebuild 2014-01-24 +* Wed Feb 07 2018 Fedora Release Engineering - 0.97-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0.97-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.97-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Apr 12 2017 Chris Leech - 0.97-3 +- switch to building as a shared library instead of static + +* Fri Feb 10 2017 Fedora Release Engineering - 0.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Miro Hrončok - 0.97-1 +- Update to 0.97 +- Upstream moved on GitHub + +* Thu Feb 04 2016 Fedora Release Engineering - 0.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Dec 12 2015 Michael Schwendt - 0.94-2 +- add -static Provides to the -devel package (#1284298) + +* 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 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.93-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Fri Dec 27 2013 Daniel Mach - 0.93-6 -- Mass rebuild 2013-12-27 +* Sat Aug 16 2014 Fedora Release Engineering - 0.93-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Fri Sep 13 2013 Chris Leech - 0.93-5 -- remove unneeded libssl requirement +* Sat Jun 07 2014 Fedora Release Engineering - 0.93-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Fri Sep 13 2013 Chris Leech - 0.93-4 -- set hardened build flag, required for long running processes (isnsd) -- patch makefile to actually use LDFLAGS +* Sun Aug 4 2013 Peter Robinson 0.93-4 +- Fix FTBFS, modernise spec -* Mon Aug 19 2013 Chris Leech - 0.93-3 -- rpmlint fixes, cleanup spec to keep building after rpm changes +* Sat Aug 03 2013 Fedora Release Engineering - 0.93-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Thu Feb 14 2013 Fedora Release Engineering - 0.93-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild