[Cooker] Re: [CHRPM] NAME: emacs VER: 20.4 REL: 8mdk

1999-11-26 Thread David BAUDENS

ChangeLog Automate écrivit :

 Last Changelog:
 
 * Fri Nov 26 1999 - David BAUDENS [EMAIL PROTECTED]
 
  - s/${RPM_ARCH}/i586
   ^^^

It's %{_target_cpu}


  - s/i386/i586


Same


David BAUDENS
-- 
MandrakeSoft  http://www.mandrakesoft.com/
   --David



Re: [Cooker] Re: [CHRPM] NAME: emacs VER: 20.4 REL: 8mdk

1999-11-26 Thread Pablo Saratxaga

On Fri, Nov 26, 1999 at 09:40:46AM +0100, David BAUDENS wrote:

 Last Changelog:
 
 * Fri Nov 26 1999 - David BAUDENS [EMAIL PROTECTED]
 
  - s/${RPM_ARCH}/i586
^^^
 
 It's %{_target_cpu}

I think you should have used %{_arch} instead; that is 'i386', for the
directory names. Otherwise people can't easily use rpm compiled for an
i386, while there is no reason they can't, other than the directory naming
problem.

I've had the same problem for building of 'python' pacakge.

In %files section I put:

/usr/lib/python1.5/plat-linux-%{_arch}

You should do, eg:


--- SPECS/emacs.specMon Nov 15 20:14:42 1999
+++ mdkSPECS/emacs.spec Fri Nov 26 12:34:36 1999
@@ -103,7 +103,7 @@
 [ -d build-nox ]  rm -rf build-nox
 mkdir build-nox  cd build-nox
 CFLAGS="$RPM_OPT_FLAGS $PUREDEF" LDFLAGS=-s \
-  ../configure ${CONFOPTS} --with-x=no ${RPM_ARCH}-mandrake-linux
+  ../configure ${CONFOPTS} --with-x=no %{_arch}-mandrake-linux
 make
 cd ..
 
@@ -111,7 +111,7 @@
 [ -d build-withx ]  rm -rf build-withx
 mkdir build-withx  cd build-withx
 CFLAGS="$RPM_OPT_FLAGS $XPUREDEF" LDFLAGS=-s \
-  ../configure ${CONFOPTS} --with-x-toolkit ${RPM_ARCH}-mandrake-linux
+  ../configure ${CONFOPTS} --with-x-toolkit %{_arch}-mandrake-linux
 make 
 cd ..
 
@@ -119,7 +119,7 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr
 
-ARCHDIR=${RPM_ARCH}-mandrake-linux
+ARCHDIR=%{_arch}-mandrake-linux
 make install -C build-withx \
prefix=$RPM_BUILD_ROOT/usr \
libexecdir=$RPM_BUILD_ROOT/usr/lib \
@@ -263,8 +263,8 @@
 %dir /usr/lib/emacs
 %dir /usr/lib/emacs/site-lisp
 %dir /usr/lib/emacs/%{PACKAGE_VERSION}
-%dir /usr/lib/emacs/%{PACKAGE_VERSION}/i386-mandrake-linux
-%attr(2755,root,mail) /usr/lib/emacs/%{PACKAGE_VERSION}/i386-mandrake-linux/movemail
+%dir /usr/lib/emacs/%{PACKAGE_VERSION}/%{_arch}-mandrake-linux
+%attr(2755,root,mail) 
+/usr/lib/emacs/%{PACKAGE_VERSION}/%{_arch}-mandrake-linux/movemail
 
 %dir /usr/share/emacs/site-lisp
 %dir /usr/share/emacs/%{PACKAGE_VERSION}

-- 
Ki ça vos våye bén,
Pablo Saratxaga

http://www.ping.be/~pin19314/   PGP Key available, key ID: 0x8F0E4975