packages: charles/charles.spec - bad merge

[glen]

Author: glen                         Date: Fri Oct 30 09:23:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bad merge

---- Files affected:
packages/charles:
   charles.spec (1.6 -> 1.8) 

---- Diffs:

================================================================
Index: packages/charles/charles.spec
diff -u packages/charles/charles.spec:1.6 packages/charles/charles.spec:1.8
--- packages/charles/charles.spec:1.6	Fri Oct 30 10:20:50 2009
+++ packages/charles/charles.spec	Fri Oct 30 10:23:48 2009
@@ -1,8 +1,9 @@
 # $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
 
-%include	/usr/lib/rpm/macros.java
-
-%define		_rel	1
+# Conditional build:
+%bcond_without	trial		# build from full tarball
 
 %define		rel	0.1
 %include	/usr/lib/rpm/macros.java
@@ -65,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/10/30 09:23:48  glen
+- bad merge
+
 Revision 1.6  2009/10/30 09:20:50  arekm
 - ups
 
================================================================

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