From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 13 Nov 2012 16:20:07 +0000 (+0000)
Subject: Packaing and build fixes.
X-Git-Tag: emi-canl-c_R_2_0_2_1~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9e708ca0f113f603638192fdeeb744c4f488b2a7;p=jra1mw.git

Packaing and build fixes.
---

diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec
index 229f2b9..8430b2f 100644
--- a/org.glite.lb.client/project/glite-lb-client.spec
+++ b/org.glite.lb.client/project/glite-lb-client.spec
@@ -65,7 +65,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
diff --git a/org.glite.lb.doc/project/glite-lb-doc.spec b/org.glite.lb.doc/project/glite-lb-doc.spec
index 553a044..64c331b 100644
--- a/org.glite.lb.doc/project/glite-lb-doc.spec
+++ b/org.glite.lb.doc/project/glite-lb-doc.spec
@@ -39,7 +39,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 
 
 %clean
diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index 0221618..ca7a323 100644
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -46,6 +46,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-harvester
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
@@ -84,7 +85,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc LICENSE project/ChangeLog doc/README
+%dir /usr/share/doc/%{name}-%{version}/
 %dir /etc/glite-lb/
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
@@ -93,6 +94,9 @@ fi
 %{_bindir}/glite-lb-harvester
 %{_libdir}/glite-lb/examples/glite-lb-harvester-test.sh
 %{_libdir}/glite-lb/examples/glite-lb-harvester-dbg
+/usr/share/doc/%{name}-%{version}/ChangeLog
+/usr/share/doc/%{name}-%{version}/LICENSE
+/usr/share/doc/%{name}-%{version}/README
 /usr/share/glite/*
 /usr/share/man/man1/glite-lb-harvester.1.gz
 
diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index b3da635..eae1fa6 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -397,7 +397,7 @@ test.query_parse: test_query_parse
 	./test_query_parse
 
 test_query_parse: test_query_parse.o
-	${LINKXX} -o $@ ${COMMON_LIBS} ${LB_UTILS_DB_LIB} ${LB_MACHINE_LIB} lb_proto.o db_supp.o lb_authz.o lb_html.o authz_policy.o query.o lb_xml_parse_V21.o lb_xml_parse.o server_stats.o lb_rss.o lb_text.o srv_purge.o notification.o userjobs.o jobstat.o dump.o crypto.o load.o server_state.o get_events.o write2rgma.o stats.o db_store.o notif_match.o il_notification.o index.o store.o db_calls.o il_lbproxy.o cond_dump.o jobstat_supp.o openserver.o seqcode.o pretty_print_wrapper.o ${EXT_LIBS} ${CPPUNIT_LIBS} $+
+	${LINKXX} -o $@ ${COMMON_LIBS} ${LB_UTILS_DB_LIB} ${LB_MACHINE_LIB} lb_proto.o db_supp.o lb_authz.o lb_html.o authz_policy.o query.o lb_xml_parse_V21.o lb_xml_parse.o server_stats.o lb_rss.o lb_text.o srv_purge.o notification.o userjobs.o jobstat.o dump.o crypto.o load.o server_state.o get_events.o write2rgma.o stats.o db_store.o notif_match.o il_notification.o index.o store.o db_calls.o il_lbproxy.o cond_dump.o jobstat_supp.o openserver.o seqcode.o pretty_print_wrapper.o ${EXT_LIBS} ${CPPUNIT_LIBS} ${EXPAT_LIBS} -lglite_jobid $+
 
 examples: ${EXAMPLES}
 
diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 1484526..0f7084a 100644
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-bkserverd
-install LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
diff --git a/org.glite.lbjp-common.jp-interface/project/package.description b/org.glite.lbjp-common.jp-interface/project/package.description
index 24890ec..205f6e9 100644
--- a/org.glite.lbjp-common.jp-interface/project/package.description
+++ b/org.glite.lbjp-common.jp-interface/project/package.description
@@ -1 +1 @@
-Definiton of interfaces required to build plugins for JP services and implementation of minimal library of support functions.
+Definition of interfaces required to build plugins for JP services and implementation of minimal library of support functions.
diff --git a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
index d6c6fe3..be94788 100644
--- a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
+++ b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
@@ -44,7 +44,7 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;