[gnome-libs] Nobody else likes macros for commands
Paul Howarth
pghmcfc at fedoraproject.org
Fri Jan 6 09:22:02 UTC 2012
commit 04d794b3513cd65087fefb553d54221d450a074a
Author: Paul Howarth <paul at city-fan.org>
Date: Fri Jan 6 09:21:39 2012 +0000
Nobody else likes macros for commands
gnome-libs.spec | 109 ++++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 53 deletions(-)
---
diff --git a/gnome-libs.spec b/gnome-libs.spec
index a8ba3b7..94561f4 100644
--- a/gnome-libs.spec
+++ b/gnome-libs.spec
@@ -5,7 +5,7 @@
Name: gnome-libs
Epoch: 1
Version: 1.4.2
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: The main GNOME1 libraries
License: LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
Group: System Environment/Libraries
@@ -17,7 +17,7 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-libs/1.4/gnome-libs
Source2: gnome-libs-pofiles.tar.gz
Source3: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
Source4: utf8-ta.po
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
Requires: xdg-utils
%else
@@ -145,8 +145,8 @@ want to use the GNOME desktop environment.
%patch53 -p1 -b .remove-duplicate-definition
# translations
-%{__tar} zxf %{SOURCE2}
-%{__cp} -pf %{SOURCE4} po/ta.po
+tar zxf %{SOURCE2}
+cp -pf %{SOURCE4} po/ta.po
cd %{dbdir}
%patch80 -p1 -b .patch
@@ -167,104 +167,104 @@ cd -
%patch108 -p1 -b .cleanlibs
%patch109 -p1 -b .ppc64-config
-/usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
-%{__mv} -f ChangeLog.utf-8 ChangeLog
+iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
+mv -f ChangeLog.utf-8 ChangeLog
# Hack to remove redundant "-lm" from the output of audiofile-config --libs
-%{__mkdir} pkgconfig
-%{__sed} -e 's/ -lm//' %{_libdir}/pkgconfig/audiofile.pc > pkgconfig/audiofile.pc
+mkdir pkgconfig
+sed -e 's/ -lm//' %{_libdir}/pkgconfig/audiofile.pc > pkgconfig/audiofile.pc
%build
# db1
pushd %{dbdir}
-%{__gzip} -9 docs/*.ps
-(cd include && %{__ln_s} -f db.h db_185.h)
+gzip -9 docs/*.ps
+(cd include && ln -s -f db.h db_185.h)
cd PORT/linux
-%{__make} OORG="%{optflags}"
-sover=$(echo libdb.so.* | %{__sed} 's/libdb.so.//')
-%{__ln_s} -f libdb1.so.${sover} libdb1.so
-%{__ln_s} -f libdb.so.${sover} libdb1.so.${sover}
+make OORG="%{optflags}"
+sover=$(echo libdb.so.* | sed 's/libdb.so.//')
+ln -s -f libdb1.so.${sover} libdb1.so
+ln -s -f libdb.so.${sover} libdb1.so.${sover}
popd
# so we don't get the wrong libpng or have gcc whining
-%{__perl} -pi -e 's at -I\$\(includedir\)[^/]?@@g' $(/usr/bin/find -name Makefile.am)
+perl -pi -e 's at -I\$\(includedir\)[^/]?@@g' $(find -name Makefile.am)
-/usr/bin/automake-1.4
+automake-1.4
echo 'dbinclude is: %{dbinclude}'
# bad hacks because re-running autoconf breaks the AC_CONFIG_SUBDIRS(libart_lgpl)
-%{__perl} -pi -e 's at ia64*@ia64* | x86_64*@g;' \
- -e 's/-lpng/`pkg-config --libs libpng10`/g;' \
- -e 's at -I */usr/include[^/]?@@g;' \
- -e 's@\$CPPFLAGS@\$CPPFLAGS -I%{_builddir}/%{name}-%{version}/%{dbinclude}@g;' \
- -e 's@\$LDFLAGS@\$LDFLAGS -L%{_builddir}/%{name}-%{version}/%{dblib}@g;' \
- configure
+perl -pi -e 's at ia64*@ia64* | x86_64*@g;' \
+ -e 's/-lpng/`pkg-config --libs libpng10`/g;' \
+ -e 's at -I */usr/include[^/]?@@g;' \
+ -e 's@\$CPPFLAGS@\$CPPFLAGS -I%{_builddir}/%{name}-%{version}/%{dbinclude}@g;' \
+ -e 's@\$LDFLAGS@\$LDFLAGS -L%{_builddir}/%{name}-%{version}/%{dblib}@g;' \
+ configure
# libjpeg-turbo >= 1.0.90 moves definition of JPEG_LIB_VERSION from jpeglib.h to jconfig.h
# which we explicitly avoid including for own reasons, so we need help finding the definition
EXTRACTED_JPEG_LIB_VERSION=$(echo JPEG_LIB_VERSION | cpp -imacros jpeglib.h -P | awk 'NF > 0')
VISIBLE_JPEG_LIB_VERSION=$(echo JPEG_LIB_VERSION | cpp -DJCONFIG_INCLUDED -imacros jpeglib.h -P | awk 'NF > 0')
if [ "$VISIBLE_JPEG_LIB_VERSION" = "JPEG_LIB_VERSION" ]; then
- JPEG_EXTRA_DEFINE="-DJPEG_LIB_VERSION=$EXTRACTED_JPEG_LIB_VERSION"
+ JPEG_EXTRA_DEFINE="-DJPEG_LIB_VERSION=$EXTRACTED_JPEG_LIB_VERSION"
fi
CFLAGS="%{optflags} $(pkg-config --cflags libpng10)"
export CPPFLAGS="$(pkg-config --cflags libpng10) $JPEG_EXTRA_DEFINE"
export PKG_CONFIG_PATH=$(pwd)/pkgconfig
%configure --with-kde-datadir=%{_datadir} --enable-prefer-db1 --disable-gtk-doc
-%{__perl} -pi -e 's/-ldb1//g; s/-ldb//g;' gnome-config
+perl -pi -e 's/-ldb1//g; s/-ldb//g;' gnome-config
# Kill bogus RPATHs
-%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
-%{__make}
+sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+make
%install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
# db1
pushd %{dbdir}
-%{__mkdir_p} %{buildroot}{%{_includedir}/db1,%{_bindir},%{_libdir}}
-%{__sed} -n '/^\/\*-/,/^ \*\//s/^.\*.\?//p' include/db.h | %{__grep} -v '^@.*db\.h' > LICENSE
-%{__perl} -pi -e 's/<db.h>/<db1\/db.h>/' PORT/include/ndbm.h
+mkdir -p %{buildroot}{%{_includedir}/db1,%{_bindir},%{_libdir}}
+sed -n '/^\/\*-/,/^ \*\//s/^.\*.\?//p' include/db.h | %{__grep} -v '^@.*db\.h' > LICENSE
+perl -pi -e 's/<db.h>/<db1\/db.h>/' PORT/include/ndbm.h
cd PORT/linux
-sover=$(echo libdb.so.* | %{__sed} 's/libdb.so.//')
-%{__install} -m755 libdb.so.${sover} %{buildroot}%{_libdir}/libdb1.so.${sover}
-%{__ln_s} -f libdb1.so.${sover} %{buildroot}%{_libdir}/libdb.so.${sover}
-%{__install} -m755 db_dump185 %{buildroot}%{_bindir}/db1_dump185
+sover=$(echo libdb.so.* | sed 's/libdb.so.//')
+install -m755 libdb.so.${sover} %{buildroot}%{_libdir}/libdb1.so.${sover}
+ln -s -f libdb1.so.${sover} %{buildroot}%{_libdir}/libdb.so.${sover}
+install -m755 db_dump185 %{buildroot}%{_bindir}/db1_dump185
popd
SAVE_LLP=${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/%{dbdir}/PORT/linux:${SAVE_LLP}
-%{__make} DESTDIR=%{buildroot} install INSTALL="%{__install} -p"
+make DESTDIR=%{buildroot} install INSTALL="install -p"
export LD_LIBRARY_PATH=${SAVE_LLP}
-%{__mkdir_p} %{buildroot}%{_datadir}/emacs/site-lisp
-%{__mkdir_p} %{buildroot}%{_mandir}/man1
-%{__mv} %{buildroot}%{_prefix}/share/doc/gnome-doc %{buildroot}%{_bindir}
-%{__chmod} a+x %{buildroot}%{_bindir}/gnome-doc
-%{__mv} %{buildroot}%{_prefix}/share/doc/mkstub %{buildroot}%{_bindir}
-%{__chmod} a+x %{buildroot}%{_bindir}/mkstub
-%{__mv} %{buildroot}%{_docdir}/gnome-doc.el %{buildroot}%{_datadir}/emacs/site-lisp
+mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp
+mkdir -p %{buildroot}%{_mandir}/man1
+mv %{buildroot}%{_prefix}/share/doc/gnome-doc %{buildroot}%{_bindir}
+chmod -c a+x %{buildroot}%{_bindir}/gnome-doc
+mv %{buildroot}%{_prefix}/share/doc/mkstub %{buildroot}%{_bindir}
+chmod -c a+x %{buildroot}%{_bindir}/mkstub
+mv %{buildroot}%{_docdir}/gnome-doc.el %{buildroot}%{_datadir}/emacs/site-lisp
# these are already in libgnomeui:
-%{__rm} -f %{buildroot}/%{_datadir}/pixmaps/gnome-*.png
+rm -f %{buildroot}/%{_datadir}/pixmaps/gnome-*.png
# unpackaged files
-%{__rm} -rf %{buildroot}%{_prefix}/doc \
- %{buildroot}%{_libdir}/*.la \
- %{buildroot}%{_datadir}/gnome/help/gnome-dev-info \
- %{buildroot}%{_docdir}/gnome-{doc,mkstub}.1 \
- %{buildroot}%{_mandir}/man{1,5} \
- %{buildroot}%{_datadir}/gtk-doc/html/libart \
- %{buildroot}%{_datadir}/type-convert/gnome-make-postscript-mimes \
- %{buildroot}%{_datadir}/type-convert/postscript.convert \
- %{buildroot}%{_libdir}/lib{art_lgpl,gnome,gnomesupport,gnomeui,gnorba,gnorbagtk,gtkxmhtml,zvt}.a
+rm -rf %{buildroot}%{_prefix}/doc \
+ %{buildroot}%{_libdir}/*.la \
+ %{buildroot}%{_datadir}/gnome/help/gnome-dev-info \
+ %{buildroot}%{_docdir}/gnome-{doc,mkstub}.1 \
+ %{buildroot}%{_mandir}/man{1,5} \
+ %{buildroot}%{_datadir}/gtk-doc/html/libart \
+ %{buildroot}%{_datadir}/type-convert/gnome-make-postscript-mimes \
+ %{buildroot}%{_datadir}/type-convert/postscript.convert \
+ %{buildroot}%{_libdir}/lib{art_lgpl,gnome,gnomesupport,gnomeui,gnorba,gnorbagtk,gtkxmhtml,zvt}.a
%find_lang %{name}
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -335,6 +335,9 @@ export LD_LIBRARY_PATH=${SAVE_LLP}
%{_libdir}/libgnomeui.so
%changelog
+* Fri Jan 6 2012 Paul Howarth <paul at city-fan.org> 1:1.4.2-20
+- Nobody else likes macros for commands
+
* Fri Feb 25 2011 Paul Howarth <paul at city-fan.org> 1:1.4.2-19
- Don't strip db1_dump185 in %%install (breaks debuginfo)
More information about the scm-commits
mailing list