Enlightenment CVS committal
Author : cobra
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
ecore.spec.in
Log Message:
Add some of the evas .spec magic from KainX to fix the recent
ecore_fb disable breakage for RPM builds.
Kevin Brosius <[EMAIL PROTECTED]>
===================================================================
RCS file: /cvs/e/e17/libs/ecore/ecore.spec.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore.spec.in 12 Aug 2006 00:11:14 -0000 1.12
+++ ecore.spec.in 22 Aug 2006 23:36:54 -0000 1.13
@@ -1,3 +1,29 @@
+# Conditional build stuff; from rpm 4.4 /usr/lib/rpm/macros.
+# bcond_without defaults to WITH, and vice versa. Yes, it's
+# ass-backward. Blame PLD.
+# from KainX's changes to evas...
+%if %{!?with:1}0
+%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%endif
+%if %{!?without:1}0
+%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%endif
+%if %{!?bcond_with:1}0
+%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%endif
+%if %{!?bcond_without:1}0
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+%endif
+
+## disabled features
+%bcond_with lib_ecore_fb
+
+## not setup yet...
+## enabled features
+##%bcond_without module_engine_software_x11
+
+
+# This just keeps a missing doxygen from killing the build.
%define _missing_doc_files_terminate_build 0
Summary: Enlightened Core X interface library
@@ -27,7 +53,9 @@
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: openssl-devel, evas-devel, eet-devel
-Requires: ecore-con, ecore-config, ecore-dbus, ecore-desktop, ecore-evas,
ecore-fb, ecore-file, ecore-ipc, ecore-job, ecore-txt, ecore-x
+Requires: ecore-con, ecore-config, ecore-dbus, ecore-desktop, ecore-evas,
ecore-file, ecore-ipc, ecore-job, ecore-txt, ecore-x
+##removed fb
+##Requires: ecore-con, ecore-config, ecore-dbus, ecore-desktop, ecore-evas,
ecore-fb, ecore-file, ecore-ipc, ecore-job, ecore-txt, ecore-x
%description devel
Ecore development files
@@ -88,13 +116,17 @@
%description evas
Ecore Evas Wrapper Library
+%if %{with lib_ecore_fb}
%package fb
Summary: Ecore frame buffer system functions
Group: Development/Libraries
Requires: %{name} = %{version}
-
%description fb
Ecore frame buffer system functions
+%define ac_with_lib_ecore_fb --enable-ecore-fb
+%else
+%define ac_with_lib_ecore_fb --disable-ecore-fb
+%endif
%package file
Summary: Ecore File Library
@@ -145,7 +177,8 @@
CFLAGS="-I/usr/kerberos/include -I/usr/X11R6/include/X11/extensions"
LDFLAGS="-L/usr/kerberos/lib -L/usr/X11R6/%{_lib}"
export CFLAGS LDFLAGS
-%{configure} --prefix=%{_prefix} --disable-ecore-dfb
+%{configure} --prefix=%{_prefix} --disable-ecore-dfb \
+ %{ac_with_lib_ecore_fb}
%{__make} %{?_smp_mflags} %{?mflags}
%install
@@ -205,9 +238,11 @@
%defattr(-, root, root)
%{_libdir}/libecore_evas.so.*
+%if %{with lib_ecore_fb}
%files fb
%defattr(-, root, root)
%{_libdir}/libecore_fb.so.*
+%endif
%files file
%defattr(-, root, root)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
