From 550d335e3ae96721a78332fbb54cd23ff39ecc75 Mon Sep 17 00:00:00 2001
From: Elan Ruusamäe
Date: Mon, 8 Feb 2010 15:43:54 +0000
Subject: - 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
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
-- 
cgit v0.10.2