Author: glen                         Date: Fri Dec  3 13:38:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bcond to build universal rpm-s (tested fc10)

---- Files affected:
packages/astah:
   astah.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/astah/astah.spec
diff -u packages/astah/astah.spec:1.26 packages/astah/astah.spec:1.27
--- packages/astah/astah.spec:1.26      Fri Dec  3 14:28:16 2010
+++ packages/astah/astah.spec   Fri Dec  3 14:38:46 2010
@@ -5,10 +5,11 @@
 #
 # Conditional build:
 %bcond_without javadoc         # don't build javadoc
+%bcond_without pld                     # don't include pld deps to build 
universal rpm
 
 %define                codename        community
 %define                ver             %(echo %{version} | tr . _)
-%include       /usr/lib/rpm/macros.java
+%{?with_pld:%include   /usr/lib/rpm/macros.java}
 Summary:       A New Java/UML Object-Oriented Design Tool
 Summary(pl.UTF-8):     Narzędzie wspomagające projektowanie oprogramowania w 
UML
 Name:          astah
@@ -31,7 +32,7 @@
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): shared-mime-info
 BuildRequires: unzip
-Requires:      jre-X11
+%{?with_pld:Requires:  jre-X11}
 Obsoletes:     jude
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -140,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/12/03 13:38:46  glen
+- bcond to build universal rpm-s (tested fc10)
+
 Revision 1.26  2010/12/03 13:28:16  glen
 - up to 6.3
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/astah/astah.spec?r1=1.26&r2=1.27&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to