Author: glen Date: Fri May 20 06:23:53 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- lib64 safe startup script
---- Files affected:
packages/charles:
charles.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.14 packages/charles/charles.spec:1.15
--- packages/charles/charles.spec:1.14 Fri May 20 08:22:01 2011
+++ packages/charles/charles.spec Fri May 20 08:23:48 2011
@@ -5,7 +5,7 @@
# Conditional build:
%bcond_without trial # build from full tarball
-%define rel 0.3
+%define rel 0.4
%include /usr/lib/rpm/macros.java
Summary: Web debugging proxy application
Name: charles
@@ -39,6 +39,11 @@
%prep
%setup -q -n %{name}
+install -p %{SOURCE1} .
+%if "%{_lib}" != "lib"
+%{__sed} -i -e 's,/usr/lib,%{_libdir},' %{name}.sh
+%endif
+
rm lib/jakarta-oro-2.0.8.jar
rm lib/activation.jar
@@ -50,7 +55,7 @@
%ifarch %{ix86}
install -p lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
%endif
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -70,6 +75,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2011/05/20 06:23:48 glen
+- lib64 safe startup script
+
Revision 1.14 2011/05/20 06:22:01 glen
- figure out which jars to use at runtime
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/charles/charles.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
