Tue Nov 6 21:42:00 2007 Michael Jennings (mej)

Spec and build fixes.
----------------------------------------------------------------------


SVN revision: 32416
This commit is contained in:
Michael Jennings 2007-11-07 05:42:08 +00:00
parent 79acfe35f8
commit d7997fe020
6 changed files with 110 additions and 45 deletions

View File

@ -16,19 +16,22 @@
%endif
## disabled features
%bcond_with lib_ecore_directfb
%bcond_with lib_ecore_sdl
## enabled features
##%bcond_without module_engine_software_x11
%bcond_without lib_ecore_fb
%bcond_without lib_ecore_directfb
# This just keeps a missing doxygen from killing the build.
%define _missing_doc_files_terminate_build 0
%define breq_lib_ecore_directfb %{?with_lib_ecore_directfb:DirectFB}
%define breq_lib_ecore_sdl %{?with_lib_ecore_sdl:SDL-devel}
%define ac_with_lib_ecore_fb --%{?with_lib_ecore_fb:en}%{!?with_lib_ecore_fb:dis}able-ecore-fb
%define ac_with_lib_ecore_directfb --%{?with_lib_ecore_directfb:en}%{!?with_lib_ecore_directfb:dis}able-ecore-dfb
%define ac_with_lib_ecore_directfb --%{?with_lib_ecore_directfb:en}%{!?with_lib_ecore_directfb:dis}able-ecore-directfb
%define ac_with_lib_ecore_sdl --%{?with_lib_ecore_sdl:en}%{!?with_lib_ecore_sdl:dis}able-ecore-sdl
Summary: Enlightened Core X interface library
Name: @PACKAGE@
@ -43,7 +46,7 @@ Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-devel, XFree86-devel
BuildRequires: libjpeg-devel, openssl-devel %{?breq_lib_ecore_directfb}
BuildRequires: curl-devel, evas-devel, eet-devel
BuildRequires: curl-devel, evas-devel, eet-devel %{?breq_lib_ecore_sdl}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@ -57,8 +60,7 @@ Summary: Ecore headers and development libraries.
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: curl-devel, openssl-devel, evas-devel, eet-devel
Requires: ecore-bin, ecore-con, ecore-config, ecore-dbus, ecore-desktop,
Requires: ecore-evas, ecore-file, ecore-ipc, ecore-job, ecore-txt
Requires: ecore-bin, ecore-con, ecore-config, ecore-evas, ecore-file, ecore-ipc, ecore-job, ecore-txt
Requires: ecore-x %{?with_lib_ecore_fb:ecore-fb} %{?with_lib_ecore_directfb:ecore-directfb}
%description devel
@ -88,22 +90,6 @@ Requires: %{name} = %{version}
%description config
Ecore Enlightened Property Library
%package dbus
Summary: Ecore DBus Library
Group: Development/Libraries
Requires: %{name} = %{version}
%description dbus
Ecore DBus Library
%package desktop
Summary: Ecore freedesktop.org .desktop, icon, menu parsing Library
Group: Development/Libraries
Requires: %{name} = %{version}
%description desktop
Ecore freedesktop.org .desktop, icon, menu parsing Library
%if %{with lib_ecore_directfb}
%package directfb
Summary: Ecore DirectFB system functions
@ -177,7 +163,11 @@ Ecore functions for dealing with the X Windows System
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} %{?ac_with_lib_ecore_fb} %{?ac_with_lib_ecore_directfb}
%{configure} --prefix=%{_prefix} \
%{?ac_with_lib_ecore_fb} \
%{?ac_with_lib_ecore_directfb} \
%{?ac_with_lib_ecore_sdl}
%{__make} %{?_smp_mflags} %{?mflags}
%install
@ -204,7 +194,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.la
%{_libdir}/*.a
%{_libdir}/pkgconfig/*
%{_datadir}/aclocal/*
#%{_datadir}/aclocal/*
%{_includedir}/*.h
%files bin
@ -219,14 +209,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%{_libdir}/libecore_config.so.*
%files dbus
%defattr(-, root, root)
%{_libdir}/libecore_dbus.so.*
%files desktop
%defattr(-, root, root)
%{_libdir}/libecore_desktop.so.*
%if %{with lib_ecore_directfb}
%files directfb
%defattr(-, root, root)

View File

@ -64,7 +64,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-, root, root)
%{_bindir}/eet-config
%{_bindir}/eet*
%{_libdir}/pkgconfig/*
%{_includedir}/*
%{_libdir}/*.a

View File

@ -66,6 +66,7 @@ AM_CONDITIONAL(DEFAULT_VISIBILITY, test "x$enable_hidden_visibility" != "xyes")
AC_SUBST(requirements)
AC_OUTPUT([
efreet.spec
efreet.pc
efreet-mime.pc
Makefile

View File

@ -0,0 +1,65 @@
%define _missing_doc_files_terminate_build 0
Summary: FreeDesktop.Org Compatibility Library
Name: @PACKAGE@
Version: @VERSION@
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/
Source: %{name}-%{version}.tar.gz
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Obsoletes: ecore-desktop <= 0.9.9.040
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Efreet implements the FreeDesktop.Org application and MIME-handling
standards.
%package devel
Summary: Efreet headers, static libraries, documentation and test programs
Group: System Environment/Libraries
Requires: %{name} = %{version}
%description devel
Headers, static libraries, test programs and documentation for Efreet
%prep
%setup -q
%build
%{configure} --prefix=%{_prefix}
%{__make} %{?_smp_mflags} %{?mflags}
%install
%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
# Get rid of unneeded testing cruft.
%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%files
%defattr(-, root, root)
%doc AUTHORS COPYING* README
%{_bindir}/%{name}*
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root)
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/*.a
%{_libdir}/pkgconfig/*
%changelog

View File

@ -52,26 +52,24 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc AUTHORS COPYING* README
%dir %{_libdir}/%{name}
%{_bindir}/%{name}_*
%{_libdir}/libemotion.a
%{_libdir}/libemotion.so.*
%{_bindir}/emotion_*
%{_libdir}/emotion/emotion_decoder_xine.a
%{_libdir}/emotion/emotion_decoder_gstreamer.a
#%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.a
%{_datadir}/emotion
%{_libdir}/%{name}/*.so
#%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.so
%{_datadir}/%{name}
%files devel
%defattr(-, root, root)
%doc doc/html
%{_libdir}/pkgconfig/emotion.pc
%{_includedir}/*.h
%{_libdir}/libemotion.so
%{_libdir}/libemotion.la
%{_libdir}/emotion/emotion_decoder_xine.la
%{_libdir}/emotion/emotion_decoder_xine.so
%{_libdir}/emotion/emotion_decoder_gstreamer.la
%{_libdir}/emotion/emotion_decoder_gstreamer.so
#%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.so
%{_libdir}/%{name}/*.a
%{_libdir}/%{name}/*.la
#%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.a
#%{_libdir}/xine/plugins/*/xineplug_vo_out_emotion.la
%{_includedir}/Emotion*
%{_libdir}/pkgconfig/%{name}.pc
%changelog

View File

@ -20,6 +20,7 @@
%bcond_with module_engine_directfb
%bcond_with module_engine_gl_x11
%bcond_with module_engine_software_qtopia
%bcond_with module_engine_software_sdl
%bcond_with module_engine_software_xcb
%bcond_with module_engine_xrender_x11
%bcond_with module_engine_xrender_xcb
@ -66,6 +67,7 @@
%define ac_with_module_engine_gl_x11 --%{?with_module_engine_gl_x11:en}%{!?with_module_engine_gl_x11:dis}able-gl-x11
%define ac_with_module_engine_directfb --%{?with_module_engine_directfb:en}%{!?with_module_engine_directfb:dis}able-directfb
%define ac_with_module_engine_software_qtopia --%{?with_module_engine_software_qtopia:en}%{!?with_module_engine_software_qtopia:dis}able-software-qtopia
%define ac_with_module_engine_software_sdl --%{?with_module_engine_software_sdl:en}%{!?with_module_engine_software_sdl:dis}able-sdl
%define ac_with_module_engine_software_xcb --%{?with_module_engine_software_xcb:en}%{!?with_module_engine_software_xcb:dis}able-software-xcb
%define ac_with_module_engine_xrender_xcb --%{?with_module_engine_xrender_xcb:en}%{!?with_module_engine_xrender_xcb:dis}able-xrender-xcb
@ -296,6 +298,17 @@ Requires: evas
Qtopia rendering engine module for Evas
%endif
%if %{with module_engine_software_sdl}
%package module_engine_software_sdl
Summary: Software SDL X11 rendering engine module for Evas
Group: System Environment/Libraries
BuildRequires: SDL-devel
Requires: evas-module_engine_software_generic
Requires: evas
%description module_engine_software_sdl
Software SDL X11 rendering engine module for Evas
%endif
%if %{with module_engine_software_xcb}
%package module_engine_software_xcb
Summary: Software XCB X11 rendering engine module for Evas
@ -343,6 +356,7 @@ Xrender XCB X11 rendering engine module for Evas
%{?ac_with_module_engine_gl_x11} \
%{?ac_with_module_engine_directfb} \
%{?ac_with_module_engine_software_qtopia} \
%{?ac_with_module_engine_software_sdl} \
%{?ac_with_module_engine_software_xcb} \
%{?ac_with_module_engine_xrender_xcb} \
$RPM_CONFIGURE_OPTS
@ -372,7 +386,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/*.a
%{_bindir}/evas-config
%{_libdir}/pkgconfig/*
%{_includedir}/*.h
@ -500,6 +513,12 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%{_libdir}/evas/modules/engines/software_qtopia/*/module.so
%endif
%if %{with module_engine_software_sdl}
%files module_engine_software_sdl
%defattr(-, root, root)
%{_libdir}/evas/modules/engines/software_sdl/*/module.so
%endif
%if %{with module_engine_software_xcb}
%files module_engine_software_xcb
%defattr(-, root, root)