xorg-cf-files 1.0.4

This commit is contained in:
Adam Jackson 2011-01-06 10:06:01 -05:00
parent d953b1b2dd
commit a6a4cdc0f0
5 changed files with 10 additions and 46 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ xorg-cf-files-1.0.3.tar.bz2
/lndir-1.0.2.tar.bz2
/makedepend-1.0.3.tar.bz2
/xorg-cf-files-1.0.3.tar.bz2
/xorg-cf-files-1.0.4.tar.bz2

View File

@ -1,7 +1,7 @@
Summary: imake source code configuration and build system
Name: imake
Version: 1.0.4
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@ -10,12 +10,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.4.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
Patch10: imake-1.0.2-find-pedantry.patch
Patch11: imake-1.0.2-abort.patch
@ -40,7 +39,6 @@ migrate software to the GNU autotools system.
#%patch0 -p0 -b .imake
#%patch1 -p0 -b .ProjectRoot
%patch2 -p0 -b .redhat
%patch3 -p0 -b .xprint
# imake patches
pushd %{name}-%{version}
@ -123,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xmkmf.1*
%changelog
* Thu Jan 06 2011 Adam Jackson <ajax@redhat.com> 1.0.4-2
- xorg-cf-files 1.0.4
- xorg-cf-files-1.0.2-xprint.patch: Drop, merged.
* Mon Nov 01 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.0.4-1
- imake 1.0.4
- makedepend 1.0.3

View File

@ -1,5 +1,5 @@
b533c0771dbbaf9b041ff35bb941d3a2 gccmakedep-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
700c6d040d36a569e657a3ba5e1d8b24 xorg-cf-files-1.0.4.tar.bz2

View File

@ -1,5 +1,5 @@
--- xorg-cf-files-1.0.3/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200
+++ xorg-cf-files-1.0.3/linux.cf 2005-12-21 11:27:16.000000000 +0100
--- xorg-cf-files-1.0.4/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200
+++ xorg-cf-files-1.0.4/linux.cf 2005-12-21 11:27:16.000000000 +0100
@@ -190,7 +190,13 @@
#endif /* LinuxDebian */

View File

@ -1,39 +0,0 @@
--- xorg-cf-files-1.0.3/X11.tmpl.xprint 2005-10-01 12:45:48.000000000 -0400
+++ xorg-cf-files-1.0.3/X11.tmpl 2006-04-25 20:24:02.000000000 -0400
@@ -3920,21 +3920,13 @@
#endif
#ifndef ExtraXawReqs
-# if BuildXaw
-# define ExtraXawReqs $(XPLIB)
-# else
-# define ExtraXawReqs /**/
-# endif
+# define ExtraXawReqs /**/
#endif
EXTRAXAWREQS = ExtraXawReqs
#ifndef ExtraXawClientDepLibs
-# if BuildXaw
-# define ExtraXawClientDepLibs $(DEPXPLIB)
-# else
-# define ExtraXawClientDepLibs /**/
-# endif
+# define ExtraXawClientDepLibs /**/
#endif
EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
@@ -3944,11 +3936,7 @@
#endif
#ifndef ExtraXawClientLibs
-# if BuildXaw
-# define ExtraXawClientLibs $(XPLIB)
-# else
-# define ExtraXawClientLibs /**/
-# endif
+# define ExtraXawClientLibs /**/
#endif
EXTRAXAWCLIENTLIBS = ExtraXawClientLibs