diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/imake.spec | 139 | ||||
| -rw-r--r-- | packaging/xorg-cf-files-1.0.0-ProjectRoot.patch | 22 | ||||
| -rw-r--r-- | packaging/xorg-cf-files-1.0.0-misc.patch | 26 |
3 files changed, 34 insertions, 153 deletions
diff --git a/packaging/imake.spec b/packaging/imake.spec index 6661397..777289c 100644 --- a/packaging/imake.spec +++ b/packaging/imake.spec @@ -1,31 +1,38 @@ -#specfile originally created for Fedora, modified for Moblin Linux -Summary: Imake source code configuration and build system -Name: imake -Version: 1.0.2 -Release: 7.1 -License: MIT/X11 -Group: User Interface/X -URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#specfile originally created for Fedora +Name: imake +Version: 1.0.2 +Release: 7.1 +License: MIT/X11 +Summary: Imake source code configuration and build system +Url: http://www.x.org +Group: User Interface/X -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 -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 -Source1001: packaging/imake.manifest -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 +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 +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 +Source1001: packaging/imake.manifest +# Gbp-Ignore-Patches: 2 3 10 +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 -BuildRequires: pkgconfig -BuildRequires: pkgconfig(xorg-macros) -BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig +BuildRequires: pkgconfig(xorg-macros) +BuildRequires: pkgconfig(xproto) -Provides: ccmakedep cleanlinks gccmakedep lndir makedepend makeg -Provides: mergelib mkdirhier mkhtmlindex revpath xmkmf +Provides: ccmakedep +Provides: cleanlinks +Provides: gccmakedep +Provides: lndir +Provides: makedepend +Provides: makeg +Provides: mergelib +Provides: mkdirhier +Provides: mkhtmlindex +Provides: revpath +Provides: xmkmf %description Imake is a deprecated source code configuration and build system which @@ -37,9 +44,7 @@ used by new software projects. Software developers are encouraged to migrate software to the GNU autotools system. %prep -%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -#%patch0 -p0 -b .imake -#%patch1 -p0 -b .ProjectRoot +%setup -q -T -c -a0 -a1 -a2 -a3 -a4 %patch2 -p0 -b .redhat %patch3 -p0 -b .xprint %patch10 -p0 -b .findpedantry @@ -64,27 +69,19 @@ cp %{SOURCE1001} . } %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 + %make_install ;; esac popd done } -%clean -rm -rf $RPM_BUILD_ROOT - %files %manifest imake.manifest %defattr(-,root,root,-) @@ -120,71 +117,3 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/mkhtmlindex.1x* %doc %{_mandir}/man1/revpath.1x* %doc %{_mandir}/man1/xmkmf.1x* -%changelog -* Sat Apr 10 2010 Anas Nashif <anas.nashif@intel.com> - 1.0.2 -- Fixed rpmlint errors -* Sat Feb 13 2010 Anas Nashif <anas.nashif@intel.com> - 1.0.2 -- Remove self Provides -* Mon Nov 30 2009 Austin Zhang <austin.zhang@intel.com> 1.0.2 -- Update to latest for fixing [MB8118] -* Sat Dec 20 2008 Arjan van de Ven <arjan@linux.intel.com> 1.0.2 -- Remove stale requires on xorg-x11-proto-devel -* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.2-6 -- Autorebuild for GCC 4.3 -* Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.0.2-5 -- Rebuild for build id -* Mon Mar 26 2007 Adam Jackson <ajax@redhat.com> 1.0.2-4 -- makedepend 1.0.1 -* Tue Jul 18 2006 Than Ngo <than@redhat.com> 1.0.2-3 -- cleanup patch files -- update source files -* Fri Jul 14 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-2 -- rebuild -* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-1 -- Update to imake-1.0.2, gccmakedep-1.0.2, xorg-cf-files-1.0.2 -* Tue Apr 25 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-4 -- Fix ExtraXawReqs to reflect reality (libXp is unneeded) -* Mon Mar 6 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3 -- Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177) -* Wed Mar 1 2006 Karsten Hopp <karsten@redhat.de> 1.0.1-2 -- Buildrequires: xorg-x11-proto-devel -* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.2 -- bump again for double-long bug on ppc(64) -* Tue Feb 7 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes -* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1 -- Updated all packages to version 1.0.1 from X11R7.0 -* Wed Dec 21 2005 Than Ngo <than@redhat.com> 1.0.0-4 -- final fix for #173593 -* Tue Dec 20 2005 Than Ngo <than@redhat.com> 1.0.0-3 -- add correct XAppLoadDir #173593 -- add more macros for fedora -* Mon Dec 19 2005 Than Ngo <than@redhat.com> 1.0.0-2 -- add some macros to fix problem in building of manpages -* Sat Dec 17 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1 -- Updated all packages to version 1.0.0 from X11R7 RC4 -- Added new lndir, gccmakedep tarballs. (#173478) -- Changed manpage dirs from man1x to man1 to match upstream RC4 default. -- Removed all previous 'misc' patch, as we now pass --with-config-dir to - configure to specify the location of the Imake config files. -- Renamed imake patch to xorg-cf-files-1.0.0-ProjectRoot.patch as it did not - patch imake at all. This should probably be changed to be a custom Red Hat - host.def file that is added as a source line instead of randomly patching - various files. -* Fri Dec 9 2005 Jesse Keating <jkeating@redhat.com> 0.99.2-5.1 -- rebuilt -* Mon Nov 28 2005 Than Ngo <than@redhat.com> 0.99.2-5 -- add correct ProjectRoot for modular X -* Wed Nov 16 2005 Than Ngo <than@redhat.com> 0.99.2-4 -- add missing host.conf -* Wed Nov 16 2005 Than Ngo <than@redhat.com> 0.99.2-3 -- fix typo -* Wed Nov 16 2005 Than Ngo <than@redhat.com> 0.99.2-2 -- fix xmkmf to look config files in /usr/share/X11/config - instead /usr/%%%%{_lib}/X11/config/ -- add host.conf -* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1 -- Updated to imake-0.99.2, xorg-cf-files-0.99.2, makedepend-0.99.2 from - X11R7 RC2. -* Thu Nov 10 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1 -- Initial build. diff --git a/packaging/xorg-cf-files-1.0.0-ProjectRoot.patch b/packaging/xorg-cf-files-1.0.0-ProjectRoot.patch deleted file mode 100644 index 37ec516..0000000 --- a/packaging/xorg-cf-files-1.0.0-ProjectRoot.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xorg-cf-files-0.99.2/site.def.orig 2005-11-28 12:18:47.000000000 +0100 -+++ xorg-cf-files-1.0.0/site.def 2005-11-28 12:21:06.000000000 +0100 -@@ -72,7 +72,7 @@ - #ifdef AfterVendorCF - - #ifndef ProjectRoot --#define ProjectRoot /usr/X11R6 -+#define ProjectRoot /usr - #endif - - /* ---- xorg-cf-files-0.99.2/X11.tmpl.orig 2005-11-28 12:19:03.000000000 +0100 -+++ xorg-cf-files-1.0.0/X11.tmpl 2005-11-28 12:31:56.000000000 +0100 -@@ -3386,7 +3386,7 @@ - #if HasMotif - - #ifndef MotifDir --#define MotifDir /usr/X11R6 -+#define MotifDir /usr - #endif - #ifndef MotifDirStandard - #define MotifDirStandard NO diff --git a/packaging/xorg-cf-files-1.0.0-misc.patch b/packaging/xorg-cf-files-1.0.0-misc.patch deleted file mode 100644 index 5296b20..0000000 --- a/packaging/xorg-cf-files-1.0.0-misc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- xorg-cf-files-1.0.0/Makefile.am.imake 2005-10-06 00:00:51.000000000 -0400 -+++ xorg-cf-files-1.0.0/Makefile.am 2005-11-16 12:58:22.000000000 -0500 -@@ -3,7 +3,8 @@ - site.def \ - xf86site.def \ - xorgsite.def \ -- xorgversion.def -+ xorgversion.def \ -+ host.def - - RULEFILES = \ - Imake.rules \ ---- xorg-cf-files-1.0.0/host.def.imake 2005-11-16 12:58:22.000000000 -0500 -+++ xorg-cf-files-1.0.0/host.def 2005-11-16 12:58:22.000000000 -0500 -@@ -0,0 +1 @@ -+#define BuildHtmlManPages NO ---- xorg-cf-files-1.0.0/xorg.cf.imake 2005-10-03 12:08:44.000000000 -0400 -+++ xorg-cf-files-1.0.0/xorg.cf 2005-11-16 12:58:22.000000000 -0500 -@@ -10,7 +10,6 @@ - - /* Get and set version information. */ - --#include "date.def" - #include "xorgversion.def" - - #if !defined(XorgVersionString) && \ |