Compare commits
No commits in common. "master" and "f21" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -15,6 +15,3 @@ xorg-cf-files-1.0.3.tar.bz2
|
||||
/lndir-1.0.3.tar.bz2
|
||||
/makedepend-1.0.4.tar.bz2
|
||||
/imake-1.0.6.tar.bz2
|
||||
/imake-1.0.7.tar.bz2
|
||||
/gccmakedep-1.0.3.tar.bz2
|
||||
/xorg-cf-files-1.0.6.tar.bz2
|
||||
|
||||
28
imake-fputs.patch
Normal file
28
imake-fputs.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From f231ed52c4adeb071de0553af7a575687a6d3dc5 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sat, 17 Aug 2013 10:12:08 +0000
|
||||
Subject: Replace fprintf with fputs
|
||||
|
||||
Fix build failure with -Werror=format-security:
|
||||
imake.c:1008:5: error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
fprintf (inFile, command);
|
||||
^
|
||||
|
||||
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
---
|
||||
diff --git a/imake.c b/imake.c
|
||||
index 7ea13e6..c20cd4a 100644
|
||||
--- a/imake.c
|
||||
+++ b/imake.c
|
||||
@@ -1005,7 +1005,7 @@ get_libc_version(FILE *inFile)
|
||||
abort ();
|
||||
|
||||
while (fgets (command, len, fp))
|
||||
- fprintf (inFile, command);
|
||||
+ fputs (command, inFile);
|
||||
|
||||
len = pclose (fp);
|
||||
remove (aout);
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
83
imake.spec
83
imake.spec
@ -1,26 +1,27 @@
|
||||
Summary: imake source code configuration and build system
|
||||
Name: imake
|
||||
Version: 1.0.7
|
||||
Release: 15%{?dist}
|
||||
Version: 1.0.6
|
||||
Release: 4%{?dist}
|
||||
License: MIT
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
|
||||
Source0: https://www.x.org/pub/individual/util/imake-1.0.7.tar.bz2
|
||||
Source1: https://www.x.org/pub/individual/util/makedepend-1.0.4.tar.bz2
|
||||
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
|
||||
# this has been merged post 1.0.6
|
||||
Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.6.tar.bz2
|
||||
Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.4.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.4.tar.bz2
|
||||
Source4: ftp://ftp.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
|
||||
Patch12: imake-fputs.patch
|
||||
|
||||
# upstream backports for AArch64
|
||||
Patch20: imake-backport-aarch64-1.patch
|
||||
Patch21: imake-backport-aarch64-2.patch
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-util-macros
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
# imake is not functional without cc
|
||||
Requires: gcc
|
||||
|
||||
Provides: ccmakedep cleanlinks gccmakedep lndir makedepend makeg
|
||||
Provides: mergelib mkdirhier mkhtmlindex revpath xmkmf
|
||||
@ -41,6 +42,11 @@ migrate software to the GNU autotools system.
|
||||
# imake patches
|
||||
pushd %{name}-%{version}
|
||||
%patch11 -p1 -b .abort
|
||||
%patch12 -p1 -b .fputs
|
||||
popd
|
||||
pushd xorg-cf-files-1.0.4
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
popd
|
||||
|
||||
%build
|
||||
@ -62,16 +68,30 @@ popd
|
||||
}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
# Install everything
|
||||
{
|
||||
for pkg in imake makedepend gccmakedep lndir xorg-cf-files ; do
|
||||
pushd $pkg-*
|
||||
case $pkg in
|
||||
# xorg-cf-files)
|
||||
# make install DESTDIR=$RPM_BUILD_ROOT libdir=%%{_datadir}
|
||||
# ;;
|
||||
*)
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
;;
|
||||
esac
|
||||
popd
|
||||
done
|
||||
}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc
|
||||
%{_bindir}/ccmakedep
|
||||
%{_bindir}/cleanlinks
|
||||
%{_bindir}/gccmakedep
|
||||
@ -104,45 +124,6 @@ popd
|
||||
%{_mandir}/man1/xmkmf.1*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.0.7-15
|
||||
- Rebuild with fixed binutils
|
||||
|
||||
* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.7-14
|
||||
- Requires: gcc
|
||||
|
||||
* Tue Jul 24 2018 Tom Callaway <spot@fedoraproject.org> - 1.0.7-13
|
||||
- add BuildRequires: gcc and gcc-c++ to ensure proper build
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.0.7-11
|
||||
- xorg-cf-files 1.0.6
|
||||
- Drop pointless %%defattr
|
||||
- HTTPS URLs
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Wed Oct 01 2014 Adam Jackson <ajax@redhat.com> 1.0.7-4
|
||||
- imake 1.0.7
|
||||
- gccmakedep 1.0.3
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
||||
10
sources
10
sources
@ -1,5 +1,5 @@
|
||||
SHA512 (gccmakedep-1.0.3.tar.bz2) = 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
|
||||
SHA512 (imake-1.0.7.tar.bz2) = b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
|
||||
SHA512 (lndir-1.0.3.tar.bz2) = c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
|
||||
SHA512 (makedepend-1.0.4.tar.bz2) = b4e276847deed9f52b86d89e4b14b5521aabc409fabb840aaaec6097fae2284be3c0f723b60e77267b6bea37c24ea8ad84afb81c4104e5f22049810e9ad6802e
|
||||
SHA512 (xorg-cf-files-1.0.6.tar.bz2) = 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
|
||||
b533c0771dbbaf9b041ff35bb941d3a2 gccmakedep-1.0.2.tar.bz2
|
||||
700c6d040d36a569e657a3ba5e1d8b24 xorg-cf-files-1.0.4.tar.bz2
|
||||
a47bcd6cecda1a6ebd3395926ea4f53a lndir-1.0.3.tar.bz2
|
||||
7acb9a831817fdd11ba7f7aaa3c74fd8 makedepend-1.0.4.tar.bz2
|
||||
d5058b1317a85bedc1dc40c7e85c8d26 imake-1.0.6.tar.bz2
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- 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
|
||||
--- 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 */
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user