|
From: <enl...@li...> - 2005-01-05 05:06:20
|
Enlightenment CVS committal
Author : mej
Project : e17
Module : apps/elation
Dir : e17/apps/elation
Modified Files:
configure.in elation.spec
Log Message:
Wed Jan 5 00:03:30 2005 Michael Jennings (mej)
Assorted spec file cleanups.
Do not override --bindir and --libdir (breaks x86_64).
Some of these are still untested, so please be patient.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 15 Jul 2004 09:47:00 -0000 1.1
+++ configure.in 5 Jan 2005 05:05:24 -0000 1.2
@@ -16,31 +16,35 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
-if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
- fi
-else
- if test "x${prefix}" = "xNONE"; then
- bindir="${ac_default_prefix}/bin";
- else
- bindir="${prefix}/bin";
+if test "x${bindir}" = 'x${exec_prefix}/bin'; then
+ if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+ else
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
fi
fi
-if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
- fi
-else
- if test "x${prefix}" = "xNONE"; then
- libdir="${ac_default_prefix}/lib";
- else
- libdir="${prefix}/lib";
+if test "x${libdir}" = 'x${exec_prefix}/lib'; then
+ if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
+ else
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
fi
fi
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elation/elation.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- elation.spec 23 Jul 2004 00:12:45 -0000 1.2
+++ elation.spec 5 Jan 2005 05:05:24 -0000 1.3
@@ -1,54 +1,46 @@
-# Note that this is NOT a relocatable package
-%define ver 0.0.1
-%define rel 1
-%define prefix /usr
-
-Summary: elation
+Summary: An EFL-based media player/DVR
Name: elation
-Version: %ver
-Release: %rel
-Copyright: BSD
-Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/elation/elation-%{ver}.tar.gz
-BuildRoot: /var/tmp/elation-root
-Packager: The Rasterman <ra...@ra...>
+Version: 0.0.1
+Release: 1.%(date '+%Y%m%d')
+License: BSD
+Group: Applications/Multimedia
URL: http://www.enlightenment.org/
-
-Docdir: %{prefix}/doc
+Source: %{name}-%{version}.tar.gz
+Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <me...@et...>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+#BuildSuggests: xorg-x11-devel
+BuildRequires: libjpeg-devel XFree86-devel
+BuildRequires: evas-devel edb-devel edje-devel imlib2-devel ecore-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
-
-Elation is a Media Player centered around being pvr/dvr-like
+Elation is a DVR-like media player.
%prep
-rm -rf $RPM_BUILD_ROOT
-
%setup -q
%build
-./configure --prefix=%prefix
-
-if [ "$SMP" != "" ]; then
- (make "MAKE=make -k -j $SMP"; exit 0)
- make
-else
- make
-fi
-###########################################################################
+%{configure} --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} %{?mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
%clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
%files
-%defattr(-,root,root)
-%attr(755,root,root) %{prefix}/bin/elation*
-%attr(755,root,root) %{prefix}/lib/elation/*
-%attr(755,root,root) %{prefix}/share/elation/data/theme.edc
-%attr(755,root,root) %{prefix}/share/elation/data/theme.eet
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/*
+%{_libdir}/*
+%{_datadir}/%{name}
%changelog
-* Sat Jun 23 2001 The Rasterman <ra...@ra...>
-- Created spec file
|