diff options
| -rw-r--r-- | packaging/imake.spec | 71 | ||||
| -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, 85 deletions
diff --git a/packaging/imake.spec b/packaging/imake.spec index 74de9aa..01d6870 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: 6 -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: 0 +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,-) 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) && \ |