Assorted build and spec fixes.

SVN revision: 60624
This commit is contained in:
Michael Jennings 2011-06-23 07:01:45 +00:00
parent 394433f438
commit 1461fec9ec
7 changed files with 84 additions and 20 deletions

View File

@ -14,7 +14,7 @@ Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.or
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-devel, vim-enhanced
BuildRequires: eet-devel, embryo-devel, evas-devel, ecore-devel
BuildRequires: eet-devel, embryo-devel, evas-devel, ecore-devel, lua-devel
Requires: evas-module_loader_eet
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -38,7 +38,7 @@ configure parts of the display.
Summary: Edje headers, static libraries, documentation and test programs
Group: System Environment/Libraries
Requires: %{name} = %{version}, %{name}-bin = %{version}
Requires: eet-devel embryo-devel evas-devel ecore-devel
Requires: eet-devel embryo-devel evas-devel ecore-devel lua-devel
%description devel
Headers, static libraries, test programs and documentation for Edje

View File

@ -24,6 +24,7 @@ includesdir = $(includedir)/eeze-@VMAJ@
libeeze_la_SOURCES = \
eeze_main.c \
eeze_udev_find.c \
eeze_udev_private.h \
eeze_udev_private.c \
eeze_udev_syspath.c \
eeze_udev_walk.c \
@ -37,4 +38,8 @@ else
endif
libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
EXTRA_DIST = eeze_udev_private.h
EXTRA_DIST = eeze_disk.c eeze_disk_udev.c eeze_disk_mount.c \
eeze_disk_libmount_old.c \
eeze_disk_libmount.c \
Eeze_Disk.h \
eeze_disk_private.h

View File

@ -55,7 +55,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING* README
%{_bindir}/%{name}*
%{_libdir}/*.so.*
%{_libdir}/efreet/efreet_desktop_cache_create
%{_libdir}/efreet/
%files devel
%defattr(-, root, root)

View File

@ -1,29 +1,29 @@
%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
%define _missing_doc_files_terminate_build 0
Summary: Data Type Library
Summary: Enlightenment Input/Output Library
Name: @PACKAGE@
Version: @VERSION@
Release: %{_rel}
License: LGPLv2.1
Group: System Environment/Libraries
Source: http://download.enlightenment.org/releases/%{name}-%{version}.tar.gz
Packager: %{?_packager:%{_packager}}%{!?_packager:Rui Miguel Silva Seabra <rms@1407.org>}
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}}
URL: http://www.enlightenment.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Enlightenment Input Output Library
Enlightenment input/output library
%package devel
Summary: Eio headers, static libraries, documentation and test programs
Summary: EIO headers, static libraries, documentation and test programs
Group: System Environment/Libraries
Requires: %{name} = %{version}
%description devel
Headers, static libraries, test programs and documentation for Eio
Headers, static libraries, test programs and documentation for EIO
%prep
%setup -q

View File

@ -1,3 +1,4 @@
%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
%define _missing_doc_files_terminate_build 0
Summary: emotion

View File

@ -42,6 +42,9 @@
%bcond_without module_loader_bmp
%bcond_without module_loader_wbmp
%bcond_without module_loader_tga
%bcond_without module_loader_ico
%bcond_without module_loader_psd
%bcond_without module_loader_generic
# This just keeps a missing doxygen from killing the build.
%define _missing_doc_files_terminate_build 0
@ -59,6 +62,9 @@
%define ac_with_module_loader_bmp --%{?with_module_loader_bmp:en}%{!?with_module_loader_bmp:dis}able-image-loader-bmp
%define ac_with_module_loader_wbmp --%{?with_module_loader_wbmp:en}%{!?with_module_loader_wbmp:dis}able-image-loader-wbmp
%define ac_with_module_loader_tga --%{?with_module_loader_tga:en}%{!?with_module_loader_tga:dis}able-image-loader-tga
%define ac_with_module_loader_ico --%{?with_module_loader_ico:en}%{!?with_module_loader_ico:dis}able-image-loader-ico
%define ac_with_module_loader_psd --%{?with_module_loader_psd:en}%{!?with_module_loader_psd:dis}able-image-loader-psd
%define ac_with_module_loader_generic --%{?with_module_loader_generic:en}%{!?with_module_loader_generic:dis}able-image-loader-generic
%define ac_with_module_saver_eet --%{?with_module_saver_eet:en}%{!?with_module_saver_eet:dis}able-image-saver-eet
%define ac_with_module_saver_jpeg --%{?with_module_saver_jpeg:en}%{!?with_module_saver_jpeg:dis}able-image-saver-jpeg
%define ac_with_module_saver_png --%{?with_module_saver_png:en}%{!?with_module_saver_png:dis}able-image-saver-png
@ -259,6 +265,33 @@ BuildRequires: libjpeg-devel
TGA Image loader module for Evas
%endif
%if %{with module_loader_ico}
%package module_loader_ico
Summary: ICO Image loader module for Evas
Group: System Environment/Libraries
BuildRequires: libjpeg-devel
%description module_loader_ico
ICO Image loader module for Evas
%endif
%if %{with module_loader_psd}
%package module_loader_psd
Summary: PSD Image loader module for Evas
Group: System Environment/Libraries
BuildRequires: libjpeg-devel
%description module_loader_psd
PSD Image loader module for Evas
%endif
%if %{with module_loader_generic}
%package module_loader_generic
Summary: Generic Image loader module for Evas
Group: System Environment/Libraries
BuildRequires: libjpeg-devel
%description module_loader_generic
Generic Image loader module for Evas
%endif
%package module_engine_software_generic
Summary: Software X11 rendering engine module for Evas
Group: System Environment/Libraries
@ -355,6 +388,7 @@ Software XCB X11 rendering engine module for Evas
%build
%{configure} --prefix=%{_prefix} --x-libraries=%{_prefix}/X11R6/%{_lib} \
--disable-install-examples \
%{?ac_with_module_loader_eet} \
%{?ac_with_module_saver_eet} \
%{?ac_with_module_loader_jpeg} \
@ -369,6 +403,12 @@ Software XCB X11 rendering engine module for Evas
%{?ac_with_module_saver_edb} \
%{?ac_with_module_loader_xpm} \
%{?ac_with_module_loader_svg} \
%{?ac_with_module_loader_bmp} \
%{?ac_with_module_loader_wbmp} \
%{?ac_with_module_loader_tga} \
%{?ac_with_module_loader_ico} \
%{?ac_with_module_loader_psd} \
%{?ac_with_module_loader_generic} \
%{?ac_with_module_engine_software_x11} \
%{?ac_with_module_engine_buffer} \
%{?ac_with_module_engine_fb} \
@ -396,18 +436,18 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING-PLAIN README
%doc AUTHORS COPYING ChangeLog INSTALL README
%{_bindir}/%{name}*
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root)
%doc src/examples/*.edc src/examples/*.png src/examples/*.c
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/*.a
%{_libdir}/pkgconfig/*
%{_includedir}/evas-1/*.h
%{_datadir}/evas/examples/*.c
%files module_engine_software_generic
%defattr(-, root, root)
%{_libdir}/evas/modules/engines/software_generic/*/module.so
@ -514,6 +554,24 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%{_libdir}/evas/modules/loaders/tga/*/module.so
%endif
%if %{with module_loader_ico}
%files module_loader_ico
%defattr(-, root, root)
%{_libdir}/evas/modules/loaders/ico/*/module.so
%endif
%if %{with module_loader_psd}
%files module_loader_psd
%defattr(-, root, root)
%{_libdir}/evas/modules/loaders/psd/*/module.so
%endif
%if %{with module_loader_generic}
%files module_loader_generic
%defattr(-, root, root)
%{_libdir}/evas/modules/loaders/generic/*/module.so
%endif
%if %{with module_engine_software_x11}
%files module_engine_software_x11
%defattr(-, root, root)

View File

@ -98,12 +98,12 @@ files_DATA += \
endif
EXTRA_DIST = $(EDCS) \
$(srcdir)/evas-buffer-simple.c \
$(srcdir)/evas-init-shutdown.c \
$(srcdir)/evas-load-error-str.c \
$(srcdir)/evas-object-manipulation.c \
$(srcdir)/evas-events.c \
$(srcdir)/evas-aspect-hints.c \
$(srcdir)/evas-hints.c \
$(srcdir)/enlightenment.png \
$(srcdir)/red.png
$(srcdir)/evas-buffer-simple.c \
$(srcdir)/evas-init-shutdown.c \
$(srcdir)/evas-load-error-str.c \
$(srcdir)/evas-object-manipulation.c \
$(srcdir)/evas-events.c \
$(srcdir)/evas-aspect-hints.c \
$(srcdir)/evas-hints.c \
$(srcdir)/enlightenment.png \
$(srcdir)/red.png