- bad merge

Changed files:
    charles.spec -> 1.8

diff --git a/charles.spec b/charles.spec
index bf49f245697c125fd6b855e441297e4dc6b81a78..74100b67a7f29a75246942eee9720b540311e46b 100644 (file)
--- 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