summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2010-02-08 15:43:54 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit550d335e3ae96721a78332fbb54cd23ff39ecc75 (patch)
tree6f192b4b797d626c84e63e6c22bd698b877ddf99
parent6a992312f153d0101dad834d7452ecf964da4ce1 (diff)
downloadnaviagent-550d335e3ae96721a78332fbb54cd23ff39ecc75.zip
naviagent-550d335e3ae96721a78332fbb54cd23ff39ecc75.tar.gz
- reorganize files in prep for simplier packaging
- alternative source (i've lost original zip, so repackaging from previous rpm) - needs 32bit libgcc_s.so.1 for pthread_cancel Changed files: naviagent.spec -> 1.5
-rw-r--r--naviagent.spec27
1 files changed, 21 insertions, 6 deletions
diff --git a/naviagent.spec b/naviagent.spec
index 34deae8..a8a9402 100644
--- a/naviagent.spec
+++ b/naviagent.spec
@@ -2,16 +2,20 @@ Summary: Navisphere Agent and CLI
Summary(pl.UTF-8): Agent i interfejs linii poleceń do Navisphere
Name: naviagentcli
Version: 6.26.0.2.24
-Release: 0.3
+Release: 0.4
License: EMC Corp
Group: Applications/System
+%if 0
Source0: NAVIAGNTCLI_LINUX_V26.zip
# NoSource0-md5: d94cec5596ee7aec1635de9140b27a89
NoSource: 0
+%endif
Source1: naviagent.init
URL: https://powerlink.emc.com/
BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
+# for 32bit libgcc
+Requires: libgcc_s.so.1
Requires: rc-scripts
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,16 +27,27 @@ Navisphere Agent and CLI.
Agent i interfejs linii poleceń do Navisphere.
%prep
-%setup -qc
+%setup -qcT
+%if 1
+ln -s %{_sourcedir}/naviagentcli-6.26.0.2.24-0.3.i686.rpm naviagentcli.noarch.rpm
+%endif
+
rpm2cpio naviagentcli.noarch.rpm | cpio -dimu
+%if 1
+mv usr/sbin bin
+mv etc/Navisphere/* etc
+%else
+mv opt/Navisphere/bin .
+mv opt/Navisphere/etc .
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/rc.d/init.d,/etc/Navisphere}
-
-install opt/Navisphere/bin/{naviagent,navicli,naviseccli} $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/naviagent
-cp -a etc/Navisphere/SupportedFlareRevisions etc/Navisphere/agent.config $RPM_BUILD_ROOT%{_sysconfdir}/Navisphere
+install -p bin/{naviagent,navicli,naviseccli} $RPM_BUILD_ROOT%{_sbindir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/naviagent
+cp -a etc/SupportedFlareRevisions etc/agent.config $RPM_BUILD_ROOT%{_sysconfdir}/Navisphere
%clean
rm -rf $RPM_BUILD_ROOT