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.
----------------------------------------------------------------------

SVN revision: 12761

diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index a5d3a4f..a10d81f 100644 (file)
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -17,31 +17,35 @@ AC_CHECK_SIZEOF(int, 4)
 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";
+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
-    bindir="${prefix}/bin";
+    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";
+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
-    libdir="${prefix}/lib";
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 

diff --git a/legacy/ecore/ecore.spec b/legacy/ecore/ecore.spec
index f857ca0..cb55c9a 100644 (file)
--- a/legacy/ecore/ecore.spec
+++ b/legacy/ecore/ecore.spec
@@ -4,12 +4,16 @@ Summary: Enlightened Core X interface library
 Name: ecore
 Version: 1.0.0
 Release: 0.pre7.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
 Group: User Interface/X
 Source: ftp://ftp.enlightenment.org/enlightenment/%{name}-%{version}_pre7.tar.gz
 URL: http://www.enlightenment.org/efm.html
-Packager: Michael Jennings <mej@eterm.org>
-#BuildSuggests: openssl-devel evas-devel xorg-x11-devel
+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}}
+#BuildSuggests: xorg-x11-devel
+BuildRequires: libjpeg-devel XFree86-devel openssl-devel
+BuildRequires: evas-devel edb-devel eet-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -22,6 +26,8 @@ use of the work put into Ecore to make this job easy for applications.
 Summary: Ecore headers and development libraries.
 Group: Development/Libraries
 Requires: %{name} = %{version}
+Requires: libjpeg-devel XFree86-devel openssl-devel
+Requires: evas-devel edb-devel eet-devel
 
 %description devel
 Ecore development files
@@ -30,6 +36,9 @@ Ecore development files
 %setup -q -n %{name}-%{version}_pre7
 
 %build
+CFLAGS="-I/usr/kerberos/include"
+LDFLAGS="-L/usr/kerberos/lib"
+export CFLAGS LDFLAGS
 %{configure} --prefix=%{_prefix}
 %{__make} %{?_smp_mflags} %{?mflags}
 

diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index f772590..adb9aeb 100644 (file)
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -35,31 +35,35 @@ fi
 
 AC_SUBST(fnmatch_libs)
 
-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";
+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
-    bindir="${prefix}/bin";
+    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";
+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
-    libdir="${prefix}/lib";
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 

diff --git a/legacy/edje/edje.spec b/legacy/edje/edje.spec
index b3ba911..c712807 100644 (file)
--- a/legacy/edje/edje.spec
+++ b/legacy/edje/edje.spec
@@ -4,13 +4,17 @@ Summary: Complex Graphical Design/Layout Engine
 Name: edje
 Version: 0.5.0
 Release: 1.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
 Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/evoak/%{name}-%{version}.tar.gz
-Packager: The Rasterman <raster@rasterman.com>
 URL: http://www.enlightenment.org/
-#BuildSuggests: libjpeg-devel zlib-devel eet-devel xorg-x11-devel
-Requires: libjpeg zlib ecore evas eet imlib2
+Source: ftp://ftp.enlightenment.org/pub/evoak/%{name}-%{version}.tar.gz
+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}}
+#BuildSuggests: xorg-x11-devel vim-enhanced
+BuildRequires: libjpeg-devel zlib-devel eet-devel XFree86-devel
+BuildRequires: edb-devel embryo-devel imlib2-devel evas-devel ecore-devel
+Requires: ecore evas eet imlib2 edb embryo
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -33,9 +37,11 @@ configure parts of the display.
 Summary: Edje headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
+Requires: libjpeg-devel zlib-devel eet-devel XFree86-devel
+Requires: edb-devel embryo-devel imlib2-devel evas-devel ecore-devel
 
 %description devel
-Headers, static libraries, test programs and documentation for Eet
+Headers, static libraries, test programs and documentation for Edje
 
 %prep
 %setup -q

diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index 33de013..b1c9cc5 100644 (file)
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -51,31 +51,35 @@ AC_DEFINE(__USE_GNU, , [Enable GNU extensions])
 
 AC_CHECK_FUNCS(fmemopen open_memstream realpath)
 
-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";
+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
-    bindir="${prefix}/bin";
+    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";
+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
-    libdir="${prefix}/lib";
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 

diff --git a/legacy/eet/eet.spec b/legacy/eet/eet.spec
index 0cd1838..b11baac 100644 (file)
--- a/legacy/eet/eet.spec
+++ b/legacy/eet/eet.spec
@@ -4,12 +4,15 @@ Summary: Library for speedy data storage, retrieval, and compression.
 Name: eet
 Version: 0.9.9
 Release: 2.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
 Group: System Environment/Libraries
 Source: ftp://ftp.enlightenment.org/pub/eet/eet-%{version}.tar.gz
-Packager: Michael Jennings <mej@eterm.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/
-#BuildSuggests: libjpeg-devel xorg-x11-devel doxygen
+#BuildSuggests: xorg-x11-devel doxygen
+BuildRequires: libjpeg-devel XFree86-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description

diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in
index 6cd6050..fa0de54 100644 (file)
--- a/legacy/embryo/configure.in
+++ b/legacy/embryo/configure.in
@@ -36,31 +36,35 @@ fi
 
 AC_SUBST(fnmatch_libs)
 
-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";
+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
-    bindir="${prefix}/bin";
+    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";
+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
-    libdir="${prefix}/lib";
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 

diff --git a/legacy/embryo/embryo.spec b/legacy/embryo/embryo.spec
index 2403840..1598548 100644 (file)
--- a/legacy/embryo/embryo.spec
+++ b/legacy/embryo/embryo.spec
@@ -4,11 +4,13 @@ Summary: embryo
 Name: embryo
 Version: 0.9.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/embryo/%{name}-%{version}.tar.gz
-Packager: Michael Jennings <mej@eterm.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}}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description

diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in
index e7cbaec..e853914 100644 (file)
--- a/legacy/emotion/configure.in
+++ b/legacy/emotion/configure.in
@@ -16,31 +16,35 @@ AC_C_CONST
 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";
+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
-    bindir="${prefix}/bin";
+    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";
+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
-    libdir="${prefix}/lib";
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 

diff --git a/legacy/emotion/emotion.spec b/legacy/emotion/emotion.spec
index 45f61eb..99e9680 100644 (file)
--- a/legacy/emotion/emotion.spec
+++ b/legacy/emotion/emotion.spec
@@ -4,12 +4,15 @@ Summary: emotion
 Name: emotion
 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/emotion/%{name}-%{version}.tar.gz
-Packager: Michael Jennings <mej@eterm.org>
-#BuildSuggests: xorg-x11-devel xine-lib-devel
+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}}
+#BuildSuggests: xorg-x11-devel
+BuildRequires: XFree86-devel xine-lib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -19,6 +22,7 @@ Emotion is a Media Library
 Summary: Emotion headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
+Requires: XFree86-devel xine-lib-devel
 
 %description devel
 Headers, static libraries, test programs and documentation for Emotion

diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index a52af69..8a466af 100644 (file)
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -22,31 +22,35 @@ AM_PROG_LIBTOOL
 
 dnl Add the languages which your application supports here.
 
-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";
+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
-    bindir="${prefix}/bin";
+    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";
+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
-    libdir="${prefix}/lib";
+    if test "x${prefix}" = "xNONE"; then
+      libdir="${ac_default_prefix}/lib";
+    else
+      libdir="${prefix}/lib";
+    fi
   fi
 fi
 

diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec
index f5d418c..fd7e033 100644 (file)
--- a/legacy/evas/evas.spec
+++ b/legacy/evas/evas.spec
@@ -4,15 +4,17 @@ Summary: Multi-platform Canvas Library
 Name: evas
 Version: 1.0.0
 Release: 0.pre13.%(date '+%Y%m%d')
-Copyright: BSD
+License: BSD
 Group: System Environment/Libraries
-Source: ftp://ftp.enlightenment.org/pub/evas/evas-%{version}_pre13.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Packager: Michael Jennings <mej@eterm.org>
 URL: http://www.enlightenment.org/
-#BuildSuggests: XFree86-devel freetype2-devel libjpeg-devel
-#BuildSuggests: libpng-devel eet-devel edb-devel xorg-x11-devel
+Source: ftp://ftp.enlightenment.org/pub/evas/evas-%{version}_pre13.tar.gz
+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}}
+#BuildSuggests: xorg-x11-devel
+BuildRequires: libpng-devel eet-devel edb-devel XFree86-devel freetype2-devel libjpeg-devel
 Provides: evas evas_software_x11 evas_loader_png evas_loader_jpeg evas_loader_eet evas_loader_edb
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 Evas is a clean display canvas API for several target display systems
@@ -23,6 +25,7 @@ images, alpha-blend objects much and more.
 Summary: Evas headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
+Requires: libpng-devel eet-devel edb-devel XFree86-devel freetype-devel libjpeg-devel
 
 %description devel
 Headers, static libraries, test programs and documentation for Evas.