rpms/imake/devel imake-0.99.2-misc.patch, 1.2, 1.3 imake.spec, 1.5, 1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 16 18:53:30 UTC 2005
Author: than
Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20859
Modified Files:
imake-0.99.2-misc.patch imake.spec
Log Message:
imake.spec
imake-0.99.2-misc.patch:
xmkmf-0.99.1/Makefile.am | 2 +-
xmkmf-0.99.1/Makefile.in | 2 +-
xorg-cf-files-0.99.2/Makefile.am | 5 +++--
xorg-cf-files-0.99.2/Makefile.in | 5 +++--
xorg-cf-files-0.99.2/host.def | 1 +
xorg-cf-files-0.99.2/xorg.cf | 1 -
6 files changed, 9 insertions(+), 7 deletions(-)
Index: imake-0.99.2-misc.patch
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake-0.99.2-misc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imake-0.99.2-misc.patch 16 Nov 2005 17:02:44 -0000 1.2
+++ imake-0.99.2-misc.patch 16 Nov 2005 18:53:27 -0000 1.3
@@ -1,27 +1,52 @@
---- imake-0.99.2/xmkmf-0.99.1/Makefile.in.imake 2005-11-16 17:59:59.000000000 +0100
-+++ imake-0.99.2/xmkmf-0.99.1/Makefile.in 2005-11-16 18:00:18.000000000 +0100
-@@ -129,7 +129,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- imake-0.99.2/xmkmf-0.99.1/Makefile.am.imake 2005-10-16 03:39:17.000000000 -0400
++++ imake-0.99.2/xmkmf-0.99.1/Makefile.am 2005-11-16 12:58:22.000000000 -0500
+@@ -19,7 +19,7 @@
+ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
-XCONFDIR = $(libdir)/X11/config
+XCONFDIR = $(datadir)/X11/config
bin_SCRIPTS = xmkmf
---- imake-0.99.2/xmkmf-0.99.1/Makefile.am.imake 2005-10-16 09:39:17.000000000 +0200
-+++ imake-0.99.2/xmkmf-0.99.1/Makefile.am 2005-11-16 17:43:34.000000000 +0100
-@@ -19,7 +19,7 @@
- # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- # PERFORMANCE OF THIS SOFTWARE.
+--- imake-0.99.2/xmkmf-0.99.1/Makefile.in.imake 2005-10-19 02:28:15.000000000 -0400
++++ imake-0.99.2/xmkmf-0.99.1/Makefile.in 2005-11-16 12:58:22.000000000 -0500
+@@ -129,7 +129,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-XCONFDIR = $(libdir)/X11/config
+XCONFDIR = $(datadir)/X11/config
bin_SCRIPTS = xmkmf
---- imake-0.99.2/xorg-cf-files-0.99.2/xorg.cf.imake 2005-10-03 18:08:44.000000000 +0200
-+++ imake-0.99.2/xorg-cf-files-0.99.2/xorg.cf 2005-11-16 17:43:34.000000000 +0100
+--- imake-0.99.2/xorg-cf-files-0.99.2/Makefile.am.imake 2005-10-06 00:00:51.000000000 -0400
++++ imake-0.99.2/xorg-cf-files-0.99.2/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 \
+@@ -125,7 +126,7 @@
+ xfree86.cf \
+ xorg.cf
+
+-configdir = $(libdir)/X11/config
++configdir = $(datadir)/X11/config
+ dist_config_DATA = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES)
+
+ EXTRA_DIST = \
+--- imake-0.99.2/xorg-cf-files-0.99.2/host.def.imake 2005-11-16 12:58:22.000000000 -0500
++++ imake-0.99.2/xorg-cf-files-0.99.2/host.def 2005-11-16 12:58:22.000000000 -0500
+@@ -0,0 +1 @@
++#define BuildHtmlManPages NO
+--- imake-0.99.2/xorg-cf-files-0.99.2/xorg.cf.imake 2005-10-03 12:08:44.000000000 -0400
++++ imake-0.99.2/xorg-cf-files-0.99.2/xorg.cf 2005-11-16 12:58:22.000000000 -0500
@@ -10,7 +10,6 @@
/* Get and set version information. */
@@ -30,7 +55,24 @@
#include "xorgversion.def"
#if !defined(XorgVersionString) && \
---- /dev/null 2005-11-14 10:27:31.515456250 +0100
-+++ imake-0.99.2/xorg-cf-files-0.99.2/host.def 2005-11-16 17:43:34.000000000 +0100
-@@ -0,0 +1 @@
-+#define BuildHtmlManPages NO
+--- imake-0.99.2/xorg-cf-files-0.99.2/Makefile.in.imake 2005-11-16 13:31:36.000000000 -0500
++++ imake-0.99.2/xorg-cf-files-0.99.2/Makefile.in 2005-11-16 13:33:43.000000000 -0500
+@@ -94,7 +94,8 @@
+ site.def \
+ xf86site.def \
+ xorgsite.def \
+- xorgversion.def
++ xorgversion.def \
++ host.def
+
+
+ RULEFILES = \
+@@ -220,7 +221,7 @@
+ xorg.cf
+
+
+-configdir = $(libdir)/X11/config
++configdir = $(datadir)/X11/config
+ dist_config_DATA = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES)
+
+ EXTRA_DIST = \
Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imake.spec 16 Nov 2005 17:06:25 -0000 1.5
+++ imake.spec 16 Nov 2005 18:53:27 -0000 1.6
@@ -1,7 +1,7 @@
Summary: imake source code configuration and build system
Name: imake
Version: 0.99.2
-Release: 3
+Release: 4
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
@@ -116,6 +116,9 @@
%{_mandir}/man1x/makedepend.1x*
%changelog
+* Wed Nov 16 2005 Than Ngo <than at redhat.com> 0.99.2-4
+- add missing host.conf
+
* Wed Nov 16 2005 Than Ngo <than at redhat.com> 0.99.2-3
- fix typo
More information about the fedora-cvs-commits
mailing list