!1 Delete patch

Merge pull request !1 from huanghaitao/master
This commit is contained in:
openeuler-ci-bot 2020-04-03 18:58:56 +08:00 committed by Gitee
commit bd2b0ca713
2 changed files with 5 additions and 21 deletions

View File

@ -1,7 +1,7 @@
Summary: imake source code configuration and build system
Name: imake
Version: 1.0.7
Release: 16
Release: 17
License: MIT
URL: http://www.x.org
@ -11,7 +11,6 @@ Source2: https://www.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
Source3: https://www.x.org/pub/individual/util/xorg-cf-files-1.0.6.tar.bz2
Source4: https://www.x.org/pub/individual/util/lndir-1.0.3.tar.bz2
Patch2: xorg-cf-files-1.0.2-redhat.patch
Patch11: imake-1.0.2-abort.patch
BuildRequires: pkgconfig gcc gcc-c++ xorg-x11-util-macros xorg-x11-proto-devel
@ -32,7 +31,6 @@ Brunhoff at Tektronix.
%prep
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
%patch2 -p0 -b .redhat
pushd %{name}-%{version}
%patch11 -p1 -b .abort
popd
@ -72,5 +70,8 @@ popd
%{_mandir}/man1/*
%changelog
* Thu Apr 3 2020 huanghaitao<huanghaitao8@huawei.com> - 1.0.7-17
- Delete patch
* Tue Dec 3 2019 caomeng<caomeng5@huawei.com> - 1.0.7-16
- Package init
- Package init

View File

@ -1,17 +0,0 @@
--- xorg-cf-files-1.0.6/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200
+++ xorg-cf-files-1.0.6/linux.cf 2005-12-21 11:27:16.000000000 +0100
@@ -190,7 +190,13 @@
#endif /* LinuxDebian */
#if LinuxDistribution == LinuxRedHat
-#define FSUseSyslog YES
+# define FSUseSyslog YES
+# define BuildRman NO
+# define BuildHtmlManPages NO
+# define ProjectRoot /usr
+# define ManPath /usr/share/man
+# define XAppLoadDir /usr/share/X11/app-defaults
+# define ConfigDir /usr/share/X11/config
#endif
#ifndef HasDevRandom