packages: charles/charles.spec - works on x86_64, too

[arekm]

Author: arekm                        Date: Fri Oct 30 09:20:36 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- works on x86_64, too

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

---- Diffs:

================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.4 packages/charles/charles.spec:1.5
--- packages/charles/charles.spec:1.4	Fri Oct 30 10:12:29 2009
+++ packages/charles/charles.spec	Fri Oct 30 10:20:31 2009
@@ -1,20 +1,20 @@
+<<<<<<< charles.spec
 # $Revision$, $Date$
-# I have no access to full version, so I'm packaging trial version only.
-# If you have full tarball, add with(out?)_trial bcond
 
-# Conditional build:
-%bcond_without	trial		# build from full tarball
+%include	/usr/lib/rpm/macros.java
+
+%define		_rel	1
 
 %define		rel	0.1
 %include	/usr/lib/rpm/macros.java
 Summary:	Web debugging proxy application
 Name:		charles
 Version:	3.4.1
-Release:	%{rel}%{?with_trial:trial}
+Release:	%{_rel}
 License:	Proprietary, not distributable
 Group:		Networking/Daemons
-Source0:	http://www.charlesproxy.com/assets/release/%{version}/%{name}.tar.gz
-# Source0-md5:	bcab2cd381d8f5ae9ffed08a0a89b76d
+Source0:	http://www.charlesproxy.com/assets/release/%{version}/charles.tar.gz
+# NoSource0-md5:	bcab2cd381d8f5ae9ffed08a0a89b76d
 NoSource:	0
 Source1:	%{name}.sh
 URL:		http://www.charlesproxy.com/
@@ -23,7 +23,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
 Requires:	jre-X11
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # already stripped
@@ -41,8 +41,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir}/%{name},%{_libdir}/%{name},%{_bindir}}
+
 cp -a lib/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+%ifarch %{ix86}
 install -p lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+%endif
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
@@ -52,8 +55,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}
 %{_javadir}/%{name}
+%ifarch %{ix86}
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libjdic.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -61,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2009/10/30 09:20:31  arekm
+- works on x86_64, too
+
 Revision 1.4  2009/10/30 09:12:29  glen
 - unified
 
================================================================

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