packages: naviagentcli/naviagentcli.spec - reorganize files in prep for sim...

[glen]

Author: glen                         Date: Mon Feb  8 15:43:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/naviagentcli:
   naviagentcli.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/naviagentcli/naviagentcli.spec
diff -u packages/naviagentcli/naviagentcli.spec:1.4 packages/naviagentcli/naviagentcli.spec:1.5
--- packages/naviagentcli/naviagentcli.spec:1.4	Sun Mar  2 22:38:02 2008
+++ packages/naviagentcli/naviagentcli.spec	Mon Feb  8 16:43:54 2010
@@ -3,16 +3,20 @@
 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)
@@ -24,16 +28,27 @@
 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
@@ -64,6 +79,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/02/08 15:43:54  glen
+- 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
+
 Revision 1.4  2008/03/02 21:38:02  qboosh
 - pl; no idea what Navisphere is
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/naviagentcli/naviagentcli.spec?r1=1.4&r2=1.5&f=u