- works on x86_64, too

Changed files:
    charles.spec -> 1.5

diff --git a/charles.spec b/charles.spec
index 60d16b268ac0acd48be464a9723f45bf6f8973ac..4cd0b29f0a0b1fa50c27fce0e1a15f68ecb25b85 100644 (file)
--- a/charles.spec
+++ b/charles.spec
@@ -1,19 +1,19 @@
-# I have no access to full version, so I'm packaging trial version only.
-# If you have full tarball, add with(out?)_trial bcond
+<<<<<<< charles.spec
 
-# 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/
@@ -22,7 +22,7 @@ BuildRequires:        rpm-javaprov
 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
@@ -40,8 +40,11 @@ the HTTP headers (which contain the cookies and caching information).
 %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
@@ -51,5 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 %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