packages: charles/charles.spec - unified

[glen]

Author: glen                         Date: Fri Oct 30 09:12:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified

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

---- Diffs:

================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.3 packages/charles/charles.spec:1.4
--- packages/charles/charles.spec:1.3	Fri Oct 30 10:02:31 2009
+++ packages/charles/charles.spec	Fri Oct 30 10:12:29 2009
@@ -1,20 +1,19 @@
 # $Revision$, $Date$
-
-%include	/usr/lib/rpm/macros.java
-
-%define		_rel	0.1
-
 # I have no access to full version, so I'm packaging trial version only.
 # If you have full tarball, add with(out?)_trial bcond
-%define		with_trial 1
 
+# Conditional build:
+%bcond_without	trial		# build from full tarball
+
+%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}%{?with_trial:trial}
 License:	Proprietary, not distributable
-Group:		Development/Languages/Java
-Source0:	%{name}.tar.gz
+Group:		Networking/Daemons
+Source0:	http://www.charlesproxy.com/assets/release/%{version}/%{name}.tar.gz
 # Source0-md5:	bcab2cd381d8f5ae9ffed08a0a89b76d
 NoSource:	0
 Source1:	%{name}.sh
@@ -27,6 +26,9 @@
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# already stripped
+%define		_enable_debug_packages	0
+
 %description
 Charles is an HTTP proxy / HTTP monitor / Reverse Proxy that enables a
 developer to view all of the HTTP and SSL / HTTPS traffic between
@@ -39,19 +41,19 @@
 %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}
-cp -a lib/*so $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name}
+cp -a lib/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -p lib/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/%{name}
-%{_libdir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}
+%{_javadir}/%{name}
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libjdic.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -59,12 +61,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/10/30 09:12:29  glen
+- unified
+
 Revision 1.3  2009/10/30 09:02:31  pawelz
-- use _rel macro
+- use rel macro
 
 Revision 1.2  2009/10/30 09:00:08  pawelz
 - R: jre-X11
 
 Revision 1.1  2009/10/30 08:57:40  pawelz
 - initial, web debugging proxy
-
================================================================

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