From 2dc8d421be0e5b91d9aabf8d593fb4bc5c3692af Mon Sep 17 00:00:00 2001
From: bringert <unknown>
Date: Thu, 24 Jun 2004 08:21:59 +0000
Subject: [PATCH] Put jar file in share instead of lib

---
 src/Makefile        | 4 ++--
 src/Makefile.binary | 6 +++---
 src/config.mk.in    | 1 +
 src/gf.spec         | 9 +++++++--
 src/jgf.in          | 4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index f328f750c..e10e19f8c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -152,9 +152,9 @@ install-gfdoc:
 	$(INSTALL) util/gfdoc $(bindir)
 
 install-editor:
-	$(INSTALL) -d $(libdir)/GF-$(PACKAGE_VERSION)
+	$(INSTALL) -d $(datadir)/GF-$(PACKAGE_VERSION)
 	$(INSTALL) jgf $(bindir)
-	$(INSTALL) -m 0644 java/gf-java.jar $(libdir)/GF-$(PACKAGE_VERSION)
+	$(INSTALL) -m 0644 java/gf-java.jar $(datedir)/GF-$(PACKAGE_VERSION)
 
 install: install-gf install-gfdoc install-editor
 
diff --git a/src/Makefile.binary b/src/Makefile.binary
index df3176810..cb43babc0 100644
--- a/src/Makefile.binary
+++ b/src/Makefile.binary
@@ -1,10 +1,10 @@
 include config.mk
 
-GF_LIB_DIR=$(libdir)/GF-$(PACKAGE_VERSION)
+GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
 
 .PHONY: install
 install: 
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) gf gfdoc jgf $(bindir)
-	$(INSTALL) -d $(GF_LIB_DIR)
-	$(INSTALL) -m 0644 gf-java.jar $(GF_LIB_DIR)
+	$(INSTALL) -d $(GF_DATA_DIR)
+	$(INSTALL) -m 0644 gf-java.jar $(GF_DATA_DIR)
diff --git a/src/config.mk.in b/src/config.mk.in
index e552983e5..0b93a6b32 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -7,6 +7,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
+datadir = @datadir@
 
 host = @host@
 
diff --git a/src/gf.spec b/src/gf.spec
index 9e19a13db..43d78ec2e 100644
--- a/src/gf.spec
+++ b/src/gf.spec
@@ -1,6 +1,6 @@
 %define name GF
 %define version 2.0
-%define release 1
+%define release 2
 
 Name: %{name}
 Summary: Grammatical Framework
@@ -58,15 +58,20 @@ cd src
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(-,root,root,0755) 
 %{_bindir}/gf
 %{_bindir}/gfdoc
 %{_bindir}/jgf
-%{_libdir}/%{name}-%{version}/gf-java.jar
+%{_datadir}/%{name}-%{version}/gf-java.jar
 %doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html}
 
 
 %changelog
 
+* Thu Jun 24 2004 Bjorn Bringert <bringert@cs.chalmers.se> 2.0-2
+- Set ownership correctly.
+- Move jar-file to share (thanks to Anders Carlsson for pointing this out.)
+
 * Tue Jun 22 2004 Bjorn Bringert <bringert@cs.chalmers.se> 2.0-1
 - Include gfdoc binary
 
diff --git a/src/jgf.in b/src/jgf.in
index cd79cb7c7..9fe514e4b 100644
--- a/src/jgf.in
+++ b/src/jgf.in
@@ -3,11 +3,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 GF_BIN_DIR=@bindir@
-GF_LIB_DIR=@libdir@/GF-@PACKAGE_VERSION@
+GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@
 
 JAVA=@JAVA@
 
 GF=$GF_BIN_DIR/gf
-JARFILE=$GF_LIB_DIR/gf-java.jar
+JARFILE=$GF_DATA_DIR/gf-java.jar
 
 exec $JAVA -jar $JARFILE "$GF -java $*"