E CVS: libs/evoak mej

[<enl...@li...>]

Enlightenment CVS committal

Author  : mej
Project : e17
Module  : libs/evoak

Dir     : e17/libs/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/libs/evoak/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in	8 Nov 2004 04:10:34 -0000	1.4
+++ configure.in	5 Jan 2005 05:05:29 -0000	1.5
@@ -19,31 +19,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/libs/evoak/evoak.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evoak.spec	25 Jul 2004 21:50:39 -0000	1.4
+++ evoak.spec	5 Jan 2005 05:05:29 -0000	1.5
@@ -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 <me...@et...>
-#BuildSuggests: libjpeg-devel zlib-devel xorg-x11-devel
+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 zlib-devel XFree86-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description