[imake] - imake 1.0.4 - makedepend 1.0.3 - lndir 1.0.2

Mon Nov 1 04:49:02 UTC 2010

commit d953b1b2dd07807f476ae75008ea1d02ac093dac
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Nov 1 14:49:13 2010 +1000

    - imake 1.0.4
    - makedepend 1.0.3
    - lndir 1.0.2

 .gitignore                      |    5 ++++
 imake-1.0.2-find-pedantry.patch |   27 +++++++++++++++++++---
 imake.spec                      |   47 +++++++++++++++++++++-----------------
 lndir-1.0.1-git-1.patch         |   11 ---------
 sources                         |    6 ++--
 5 files changed, 57 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1777fa4..19dc0ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,8 @@ xorg-cf-files-1.0.2.tar.bz2
 makedepend-1.0.1.tar.bz2
 makedepend-1.0.2.tar.bz2
 xorg-cf-files-1.0.3.tar.bz2
+/gccmakedep-1.0.2.tar.bz2
+/imake-1.0.4.tar.bz2
+/lndir-1.0.2.tar.bz2
+/makedepend-1.0.3.tar.bz2
+/xorg-cf-files-1.0.3.tar.bz2
diff --git a/imake-1.0.2-find-pedantry.patch b/imake-1.0.2-find-pedantry.patch
index 27e555a..2b57e71 100644
--- a/imake-1.0.2-find-pedantry.patch
+++ b/imake-1.0.2-find-pedantry.patch
@@ -1,10 +1,29 @@
-diff -up imake-1.0.2/cleanlinks.jx imake-1.0.2/cleanlinks
---- imake-1.0.2/cleanlinks.jx	2004-12-03 19:42:46.000000000 -0500
-+++ imake-1.0.2/cleanlinks	2009-02-08 02:17:08.000000000 -0500
-@@ -23,5 +23,5 @@ find . -type l -print |
+From 835dc3caff5a97000d0a9b5c5e719ec6f5c4a833 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at nwnk.net>
+Date: Mon, 1 Nov 2010 14:29:33 +1000
+Subject: [PATCH] Silence useless pedantry warning from find(1) when running cleanlinks.
+
+"find: warning: you have specified the -depth option after a non-option
+argument -type, but options are not positional (-depth affects tests
+specified before it as well as those specified after it).  Please specify
+options before other arguments."
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ cleanlinks |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/cleanlinks b/cleanlinks
+index 3c81d9f..2724800 100644
+--- a/cleanlinks
++++ b/cleanlinks
+@@ -22,5 +22,5 @@ find . -type l -print |
  
  echo Removing empty directories ...
  #find . -type d -depth -print | xargs rmdir > /dev/null 2>&1
 -find . -type d -depth -empty -print -exec rmdir {} \;
 +find . -depth -type d -empty -print -exec rmdir {} \;
  exit 0
+-- 
+1.7.3.1
+
diff --git a/imake.spec b/imake.spec
index a990965..a29dbe2 100644
--- a/imake.spec
+++ b/imake.spec
@@ -1,23 +1,21 @@
 Summary: imake source code configuration and build system
 Name: imake
-Version: 1.0.2
-Release: 15%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.2.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.2.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.4.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.3.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.3.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.2.tar.bz2
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
 Patch2: xorg-cf-files-1.0.2-redhat.patch
 Patch3: xorg-cf-files-1.0.2-xprint.patch
-# fix RH BZ #538249
-Patch4: lndir-1.0.1-git-1.patch
 Patch10: imake-1.0.2-find-pedantry.patch
 Patch11: imake-1.0.2-abort.patch
 
@@ -43,10 +41,12 @@ migrate software to the GNU autotools system.
 #%patch1 -p0 -b .ProjectRoot
 %patch2 -p0 -b .redhat
 %patch3 -p0 -b .xprint
-%patch4 -p0 -b .lndir
 
-%patch10 -p0 -b .find
-%patch11 -p0 -b .abort
+# imake patches
+pushd %{name}-%{version}
+%patch10 -p1 -b .find
+%patch11 -p1 -b .abort
+popd
 
 %build
 # Build everything
@@ -109,20 +109,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/config/*.rules
 %{_datadir}/X11/config/*.tmpl
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/ccmakedep.1x*
-%{_mandir}/man1/cleanlinks.1x*
-%{_mandir}/man1/gccmakedep.1x*
-%{_mandir}/man1/imake.1x*
-%{_mandir}/man1/lndir.1x*
+%{_mandir}/man1/ccmakedep.1*
+%{_mandir}/man1/cleanlinks.1*
+%{_mandir}/man1/gccmakedep.1*
+%{_mandir}/man1/imake.1*
+%{_mandir}/man1/lndir.1*
 %{_mandir}/man1/makedepend.1*
-%{_mandir}/man1/makeg.1x*
-%{_mandir}/man1/mergelib.1x*
-%{_mandir}/man1/mkdirhier.1x*
-%{_mandir}/man1/mkhtmlindex.1x*
-%{_mandir}/man1/revpath.1x*
-%{_mandir}/man1/xmkmf.1x*
+%{_mandir}/man1/makeg.1*
+%{_mandir}/man1/mergelib.1*
+%{_mandir}/man1/mkdirhier.1*
+%{_mandir}/man1/mkhtmlindex.1*
+%{_mandir}/man1/revpath.1*
+%{_mandir}/man1/xmkmf.1*
 
 %changelog
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.0.4-1
+- imake 1.0.4
+- makedepend 1.0.3
+- lndir 1.0.2
+
 * Mon Oct 25 2010 Adam Jackson <ajax at redhat.com> 1.0.2-15
 - imake-1.0.2-abort.patch: Paper over an abort (#646561)
 
diff --git a/sources b/sources
index 5ae15cf..a043041 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 b533c0771dbbaf9b041ff35bb941d3a2  gccmakedep-1.0.2.tar.bz2
-02fea5a02ba2857c7d81820c8e8b8e6f  imake-1.0.2.tar.bz2
-e274ea9f55dfd62afa0a7b1e1ab4ba96  lndir-1.0.1.tar.bz2
-62e58330fe8d1e3e28c7a45779833a48  makedepend-1.0.2.tar.bz2
 10546b5ddda3cdda7950bb56bf98e0ea  xorg-cf-files-1.0.3.tar.bz2
+48133c75bd77c127c7eff122e08ebbf6  imake-1.0.4.tar.bz2
+619acbb2ed766d7762f02328513b1f72  lndir-1.0.2.tar.bz2
+4e6cb97bbecfbb34f3f644a75e513093  makedepend-1.0.3.tar.bz2
