mej pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=b5ac82d7488fc9ba0aed41db6f54b6c3657744cd

commit b5ac82d7488fc9ba0aed41db6f54b6c3657744cd
Author: Michael Jennings <m...@lbl.gov>
Date:   Thu May 12 11:42:54 2016 -0700

    enlightenment.spec.in:  Update spec file to work with current Git.
    
    Add support for systemd detection/inclusion.  Update file lists.
    Update/remove outdated build dependencies.  Remove unnecessary .la
    files from final packages.
---
 enlightenment.spec.in | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/enlightenment.spec.in b/enlightenment.spec.in
index 4098049..69e729d 100644
--- a/enlightenment.spec.in
+++ b/enlightenment.spec.in
@@ -1,4 +1,13 @@
+%define __os_install_post /usr/lib/rpm/brp-compress
+%define debug_package %{nil}
 %{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
+%define _missing_doc_files_terminate_build 0
+
+%if %(systemctl --version | head -1 | cut -d' ' -f2) >= 209
+%{expand:%%global have_systemd 1}
+%endif
+
+%{expand:%%global ac_enable_systemd 
--%{?have_systemd:en}%{!?have_systemd:dis}able-systemd}
 
 Summary: The Enlightenment window manager
 Name: @PACKAGE@
@@ -12,8 +21,8 @@ Packager: %{?_packager:%{_packager}}%{!?_packager:Michael 
Jennings <m...@eterm.or
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment 
Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 #BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel
-BuildRequires: efl-devel >= @efl_version@, eeze-devel, edje-devel, edje-bin, 
emotion-devel
-BuildRequires: xcb-devel, xcb-util-devel
+BuildRequires: efl-devel >= @efl_version@
+BuildRequires: libxcb-devel, xcb-util-devel
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -25,7 +34,7 @@ Enlightenment is a window manager.
 Summary: Development headers for Enlightenment. 
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
-Requires: efl-devel, edje-devel
+Requires: efl-devel >= @efl_version@
 
 %description devel
 Development headers for Enlightenment.
@@ -36,15 +45,16 @@ Development headers for Enlightenment.
 
 
 %build
-%{configure} --prefix=%{_prefix} --with-profile=FAST_PC
+%{configure} --prefix=%{_prefix} %{ac_enable_systemd} --with-profile=FAST_PC 
CFLAGS="-O0 -ggdb3"
 %{__make} %{?_smp_mflags} %{?mflags}
 
 
 %install
 %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
 test -x `which doxygen` && sh gendoc || :
-rm -f `find $RPM_BUILD_ROOT/usr/lib/enlightenment -name "*.a" -print`
-rm -f `find $RPM_BUILD_ROOT/usr/lib/enlightenment -name "*.la" -print`
+find $RPM_BUILD_ROOT%{_prefix} -name '*.la' -print0 | xargs -0 rm -f
+
+%{find_lang} %{name}
 
 
 %clean
@@ -59,20 +69,23 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING README
 %dir %{_sysconfdir}/enlightenment
 %config(noreplace) %{_sysconfdir}/enlightenment/*
 %config(noreplace) %{_sysconfdir}/xdg/menus/e-applications.menu
+%{_bindir}/emixer
 %{_bindir}/enlightenment
 %{_bindir}/enlightenment_*
-#%{_bindir}/eap_to_desktop
 %{_libdir}/%{name}/
 %{_datadir}/%{name}/
-%{_datadir}/locale/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/e*
 %{_datadir}/xsessions/%{name}.desktop
-%{_datadir}/applications/enlightenment_filemanager.desktop
+%if %{?have_systemd:1}0
+%{_prefix}/lib/systemd/*/*.service
+%endif
 
 %files devel
 %defattr(-, root, root)

-- 


Reply via email to