From 5f2b8dd5b125837b239009246c7771198d6b09a0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Fri, 30 Oct 2009 09:23:48 +0000
Subject: [PATCH] - bad merge

Changed files:
    charles.spec -> 1.8
---
 charles.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/charles.spec b/charles.spec
index bf49f24..74100b6 100644
--- a/charles.spec
+++ b/charles.spec
@@ -1,4 +1,10 @@
-%define		_rel	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
+
+# 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
-- 
2.44.0