Enlightenment CVS committal
Author : mej
Project : e17
Module : proto
Dir : e17/proto/evoak
Modified Files:
configure.in evoak.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/proto/evoak/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- configure.in 31 Aug 2004 04:45:05 -0000 1.1.1.1
+++ configure.in 5 Jan 2005 05:05:30 -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/proto/evoak/evoak.spec,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- evoak.spec 31 Aug 2004 04:45:05 -0000 1.1.1.1
+++ evoak.spec 5 Jan 2005 05:05:30 -0000 1.2
@@ -4,12 +4,15 @@
Name: evoak
Version: 0.0.1
Release: 1.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org/
Source: ftp://ftp.enlightenment.org/pub/evoak/%{name}-%{version}.tar.gz
-Packager: Michael Jennings <[EMAIL PROTECTED]>
-#BuildSuggests: libjpeg-devel zlib-devel xorg-x11-devel
+Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL
PROTECTED]>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+#BuildSuggests: xorg-x11-devel
+BuildRequires: libjpeg-devel zlib-devel XFree86-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -22,6 +25,7 @@
Summary: Evoak headers, static libraries, documentation and test programs
Group: System Environment/Libraries
Requires: %{name} = %{version}
+Requires: libjpeg-devel zlib-devel XFree86-devel
%description devel
Headers, static libraries, test programs and documentation for Eet
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
