From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 29 Sep 2012 20:33:22 +0000 (+0000)
Subject: More rpmlint warnings:
X-Git-Tag: gridsite-core_R_1_7_23~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3795289cfb1b1d565d56c27671229d8b8e75b6f1;p=jra1mw.git

More rpmlint warnings:
- autostart after installation in startup scripts only on Debian
- don't install lb.server headers (used to be used for lb.proxy)
- reshuffle .sql files and migraton scripts locations
- install msg.conf example only into doc
---

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index a2787e1..71a3587 100644
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -72,6 +72,9 @@ startup: ${top_srcdir}/config/startup
 		glite_var="${localstatedir}"; \
 	fi; \
 	sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' -e "s:@glite_var@:$$glite_var:g" -e 's:@defaultdir@:${sysdefaultdir}:g' $< > $@
+ifneq ($(os_type),debian)
+	sed -i 's/# \(Default-Start\|Default-Stop\):.*/# \1:/' $@
+endif
 	chmod +x $@
 
 check:
@@ -86,13 +89,14 @@ stage: compile
 install: compile
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples \
 		${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} \
+		${DESTDIR}${PREFIX}${prefix}/share/glite \
 		${DESTDIR}${PREFIX}${prefix}/share/man/man1 \
 		${DESTDIR}${PREFIX}${sysconfdir}/init.d \
 		${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
 	${INSTALL} -m 755 harvester ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-harvester
 	${INSTALL} -m 755 harvester-dbg ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-harvester-dbg
 	${INSTALL} -m 755 ${top_srcdir}/examples/test.sh ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-harvester-test.sh
-	${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/harvester-test-dbsetup.sql
+	${INSTALL} -m 444 ${top_srcdir}/examples/test.sql ${DESTDIR}${PREFIX}${prefix}/share/glite/glite-lb-harvester-test-dbsetup.sql
 	${INSTALL} -m 444 ${top_srcdir}/doc/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
 	${INSTALL} -m 444 glite-lb-harvester.1 ${DESTDIR}${PREFIX}${prefix}/share/man/man1
 	${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-harvester
diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup
index 0dc078c..af9b265 100755
--- a/org.glite.lb.harvester/config/startup
+++ b/org.glite.lb.harvester/config/startup
@@ -2,12 +2,13 @@
 ### BEGIN INIT INFO
 # Provides: glite-lb-harvester
 # Description: L&B harvester deamon
+# Short-Description: L&B harvester deamon
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $network $syslog
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 ### END INIT INFO
-# chkconfig: 345 75 25
+# chkconfig: - 75 25
 #
 # Copyright (c) Members of the EGEE Collaboration. 2004-2010.
 # See http://www.eu-egee.org/partners/ for details on the copyright holders.
diff --git a/org.glite.lb.harvester/examples/test.sh b/org.glite.lb.harvester/examples/test.sh
index 6a9483a..8b73c09 100755
--- a/org.glite.lb.harvester/examples/test.sh
+++ b/org.glite.lb.harvester/examples/test.sh
@@ -172,7 +172,7 @@ create_db() {
 		echo -n "."
 		mysql $MYSQL_ARGS -e "GRANT ALL on $DB_NAME.* to $DB_USER@$DB_HOST" && \
 		echo -n "."
-		mysql -u $DB_USER $DB_NAME -h $DB_HOST < $GLITE_LOCATION_ETC/glite-lb/glite-lb-dbsetup.sql || return $?
+		mysql -u $DB_USER $DB_NAME -h $DB_HOST < $GLITE_LOCATION/share/glite/glite-lb-dbsetup.sql || return $?
 		echo -n "."
 		mkdir -p `pwd`/LB
 		cat > `pwd`/LB/glite-lb-index.conf << EOF
@@ -190,8 +190,8 @@ EOF
 	fi
 	echo -n "OK psql."
 	rm -f 'test.sql'
-	if [ -f "$GLITE_LOCATION_ETC/glite-lb/harvester-test-dbsetup.sql" ]; then
-		ln -s "$GLITE_LOCATION_ETC/glite-lb/harvester-test-dbsetup.sql" test.sql
+	if [ -f "$GLITE_LOCATION/share/glite/glite-lb-harvester-test-dbsetup.sql" ]; then
+		ln -s "$GLITE_LOCATION/share/glite/glite-lb-harvester-test-dbsetup.sql" test.sql
 	else
 		wget --quiet -O 'test.sql' 'http://jra1mw.cvs.cern.ch/cgi-bin/jra1mw.cgi/org.glite.lb.harvester/examples/test.sql?revision=HEAD'
 	fi
diff --git a/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs b/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs
index a604a74..3aef430 100644
--- a/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs
+++ b/org.glite.lb.harvester/project/debian.glite-lb-harvester.dirs
@@ -4,5 +4,6 @@ usr/bin
 usr/lib
 usr/lib/glite-lb
 usr/lib/glite-lb/examples
+usr/share/glite
 usr/share/doc/glite-lb-harvester
 usr/share/man/man1
diff --git a/org.glite.lb.harvester/project/debian.glite-lb-harvester.install b/org.glite.lb.harvester/project/debian.glite-lb-harvester.install
index be7803c..1f83a23 100644
--- a/org.glite.lb.harvester/project/debian.glite-lb-harvester.install
+++ b/org.glite.lb.harvester/project/debian.glite-lb-harvester.install
@@ -1,6 +1,6 @@
-etc/glite-lb/*
 etc/init.d/glite-lb-harvester
 usr/bin/*
 usr/lib/glite-lb/examples/*
 usr/share/doc/glite-lb-harvester/*
+usr/share/glite/*
 usr/share/man/man1/*
diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index 3267b1e..da9af22 100644
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -87,13 +87,14 @@ fi
 %dir /etc/glite-lb/
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
+%dir /usr/share/glite/
 %dir /usr/share/doc/%{name}-%{version}/
-/etc/glite-lb/harvester-test-dbsetup.sql
 /etc/init.d/glite-lb-harvester
 /usr/bin/glite-lb-harvester
 /usr/%{_lib}/glite-lb/examples/glite-lb-harvester-test.sh
 /usr/%{_lib}/glite-lb/examples/glite-lb-harvester-dbg
 /usr/share/doc/%{name}-%{version}/README
+/usr/share/glite/*
 /usr/share/man/man1/glite-lb-harvester.1.gz
 
 
diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index 309fb62..651b880 100644
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -129,13 +129,13 @@ install:
 	-mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
 	-mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/cron.d
 	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+	${INSTALL} -m 644 ${top_srcdir}/config/msg.conf.example ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
 	${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}
 	${INSTALL} -m 755 ${EXAMPLES} ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
 	( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
-	${INSTALL} -m 644 ${top_srcdir}/config/msg.conf.example ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
 	${INSTALL} -m 755 ${top_srcdir}/src/msg-brokers ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-msg-brokers
 	${INSTALL} -m 755 msg-config.new ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-msg-config
-	${INSTALL} -m 644 msg.cron.new ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-logger-msg.cron
+	${INSTALL} -m 644 msg.cron.new ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-logger-msg
 
 %.lo %.o: %.cpp
 	${COMPILEXX} -c $< -o $@
diff --git a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
index b7eb97b..894a24b 100644
--- a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
+++ b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
@@ -1,4 +1,3 @@
-etc/glite-lb/*
 etc/cron.d/*
 usr/lib/activemq_cpp_plugin.so*
 usr/lib/glite-lb/examples/*
diff --git a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
index 5263537..d16fc64 100644
--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
@@ -60,14 +60,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
 %dir /usr/share/doc/%{name}-%{version}/
-%config(missingok) /etc/glite-lb/msg.conf.example
-/etc/cron.d/glite-lb-logger-msg.cron
+/etc/cron.d/glite-lb-logger-msg
 /usr/%{_lib}/activemq_cpp_plugin.so
 /usr/%{_lib}/activemq_cpp_plugin.so.0
 /usr/%{_lib}/activemq_cpp_plugin.so.0.0.0
 /usr/%{_lib}/glite-lb/examples/glite-lb-cmsclient
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE
+/usr/share/doc/%{name}-%{version}/msg.conf.example
 /usr/share/doc/%{name}-%{version}/package.summary
 /usr/share/doc/%{name}-%{version}/package.description
 /usr/sbin/glite-lb-msg-*
diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 97a7800..14f8252 100644
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -157,6 +157,9 @@ startup: ${top_srcdir}/config/startup
 		glite_var="${localstatedir}"; \
 	fi; \
 	sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' -e "s:@glite_var@:$$glite_var:g" -e 's:@defaultdir@:${sysdefaultdir}:g' $< > $@
+ifneq ($(os_type),debian)
+	sed -i 's/# \(Default-Start\|Default-Stop\):.*/# \1:/' $@
+endif
 	chmod +x $@
 
 glite-lb-logd: ${LOGD_OBJS}
diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index b5a4dfc..7275dbe 100755
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -2,12 +2,13 @@
 ### BEGIN INIT INFO
 # Provides: glite-lb-locallogger
 # Description: L&B local logger and interlogger deamons
+# Short-Description: L&B local logger and interlogger deamons
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $network $syslog
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 ### END INIT INFO
-# chkconfig: 345 76 24
+# chkconfig: - 76 24
 #
 # Copyright (c) Members of the EGEE Collaboration. 2004-2010.
 # See http://www.eu-egee.org/partners/ for details on the copyright holders.
diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index e137785..e74a478 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -330,6 +330,9 @@ ${SCRIPTS}: ${SCRIPTS_SRC}
 		glite_var="${localstatedir}"; \
 	fi; \
 	sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' -e "s:@glite_var@:$$glite_var:g" -e 's:@defaultdir@:${sysdefaultdir}:g' ${top_srcdir}/config/$@ > $@
+ifneq ($(os_type),debian)
+	sed -i 's/# \(Default-Start\|Default-Stop\):.*/# \1:/' $@
+endif
 
 %.sh: %.sh.in
 	glite_var="${localstatedir}/glite"; \
@@ -420,10 +423,10 @@ install:
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb ${DESTDIR}${PREFIX}${sysconfdir}/init.d
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/glite
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
-	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
 	-mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/logrotate.d
 	-mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/cron.d
 	-mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/mysql/conf.d
@@ -442,12 +445,10 @@ install:
 	${INSTALL} -m 755 export.sh ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-export
 	${INSTALL} -m 755 notif-keeper.sh ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-notif-keeper
 
-	for f in dbsetup.sql index.conf.template; do \
-		${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb; \
-		ln -sf "glite-lb/glite-lb-$$f" "${DESTDIR}${PREFIX}${sysconfdir}/glite-lb-$$f"; \
-	done
-	${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
-	${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version40 ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
+	${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-dbsetup.sql ${DESTDIR}${PREFIX}${prefix}/share/glite
+	${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-index.conf.template ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
+	${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${DESTDIR}${PREFIX}${prefix}/sbin
+	${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version40 ${DESTDIR}${PREFIX}${prefix}/sbin
 	${INSTALL} -m 644 ${top_srcdir}/config/site-notif.conf ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
 
 	${INSTALL} -m 755 startup ${DESTDIR}${PREFIX}${sysconfdir}/init.d/glite-lb-bkserverd
@@ -459,10 +460,7 @@ install:
 	${INSTALL} -m 644 ${top_srcdir}/config/my.cnf ${DESTDIR}${PREFIX}${sysconfdir}/mysql/conf.d/glite-lb-server.cnf
 	${INSTALL} -m 644 glite-lb ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/glite-lb
 
-	mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
-	(cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix})
 	install -m 644 ${STATIC_LIB_BK} ${DESTDIR}${PREFIX}${prefix}/${libdir}
-	${INSTALL} -m 644 ${top_srcdir}/interface/srv_perf.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
 ifdef LB_PERF
 	${INSTALL} -m 755 ${top_srcdir}/src/perftest_proxy.sh ${DESTDIR}${PREFIX}${prefix}/sbin
 endif
diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index c20d9f3..b25c355 100755
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -247,7 +247,7 @@ if test "$setup_db" = 1; then
 	fi
 	rm -f /tmp/glite-setup.$$
 
-	if test ! -f $GLITE_LOCATION_ETC/glite-lb/glite-lb-dbsetup.sql; then
+	if test ! -f $GLITE_LOCATION/share/glite/glite-lb-dbsetup.sql; then
 		echo "glite-lb-setup: ERROR: glite-lb-dbsetup.sql not found (glite-lb-server not installed?)"
 		error="$error db"
 		exit 1
@@ -261,7 +261,7 @@ if test "$setup_db" = 1; then
 		mysql $MYSQL_ARGS -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver@'$HOSTNAME' IDENTIFIED BY '' WITH GRANT OPTION;"
 		mysql $MYSQL_ARGS -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver@localhost IDENTIFIED BY '' WITH GRANT OPTION;"
 
-		mysql -u lbserver lbserver20 < $GLITE_LOCATION_ETC/glite-lb/glite-lb-dbsetup.sql
+		mysql -u lbserver lbserver20 < $GLITE_LOCATION/share/glite/glite-lb-dbsetup.sql
 		mysql -u lbserver -e "ALTER TABLE short_fields MAX_ROWS=1000000000;" lbserver20
 		mysql -u lbserver -e "ALTER TABLE long_fields MAX_ROWS=55000000;" lbserver20
 		mysql -u lbserver -e "ALTER TABLE states MAX_ROWS=9500000;" lbserver20
@@ -301,9 +301,9 @@ EOF
 	rm /tmp/glite-lb-bkindex.$$
 
 	# migrate L&B 3.x to L&B 4.0
-	if test -f $GLITE_LOCATION_ETC/glite-lb/glite-lb-migrate_db2version40; then
+	if test -f $GLITE_LOCATION/sbin/glite-lb-migrate_db2version40; then
 		if ! check_mysql_table lbserver20 job_connections; then
-			sh $GLITE_LOCATION_ETC/glite-lb/glite-lb-migrate_db2version40 -s
+			sh $GLITE_LOCATION/sbin/glite-lb-migrate_db2version40 -s
 			if test $? -eq 0; then
 				qecho "Database migrated to L&B 4.x"
 			else
diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index be40f08..bb5e34b 100755
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -2,12 +2,13 @@
 ### BEGIN INIT INFO
 # Provides: glite-lb-bkserverd
 # Description: L&B server daemon
+# Short-Description: L&B server daemon
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $network $syslog
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 ### END INIT INFO
-# chkconfig: 345 75 25
+# chkconfig: - 75 25
 #
 # Copyright (c) Members of the EGEE Collaboration. 2004-2010.
 # See http://www.eu-egee.org/partners/ for details on the copyright holders.
diff --git a/org.glite.lb.server/project/debian.glite-lb-server.dirs b/org.glite.lb.server/project/debian.glite-lb-server.dirs
index 959edf7..23445f6 100644
--- a/org.glite.lb.server/project/debian.glite-lb-server.dirs
+++ b/org.glite.lb.server/project/debian.glite-lb-server.dirs
@@ -5,11 +5,9 @@ etc/logrotate.d
 etc/mysql
 etc/mysql/conf.d
 usr/bin
-usr/include
-usr/include/glite
-usr/include/glite/lb
 usr/lib
 usr/sbin
+usr/share/glite
 usr/share/doc/glite-lb-server
 usr/share/man/man1
 usr/share/man/man8
diff --git a/org.glite.lb.server/project/debian.glite-lb-server.install b/org.glite.lb.server/project/debian.glite-lb-server.install
index 44a9833..4d9d04d 100644
--- a/org.glite.lb.server/project/debian.glite-lb-server.install
+++ b/org.glite.lb.server/project/debian.glite-lb-server.install
@@ -3,10 +3,9 @@ etc/glite-lb/*
 etc/init.d/*
 etc/logrotate.d/*
 etc/mysql/conf.d/*
-etc/*
 usr/bin/*
-usr/include/glite/lb/*
 usr/sbin/*
 usr/share/doc/glite-lb-server/*
+usr/share/glite/*
 usr/share/man/man1/*
 usr/share/man/man8/*
diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 3e8b148..44655e4 100644
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -116,17 +116,13 @@ fi
 %defattr(-,root,root)
 %dir /etc/cron.d/
 %dir /etc/glite-lb/
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
 %dir /usr/share/doc/%{name}-%{version}/
+%dir /usr/share/glite/
 %config(noreplace) /etc/logrotate.d/glite-lb-server
 %config(noreplace) /etc/mysql/conf.d/glite-lb-server.cnf
 %config(noreplace) /etc/glite-lb/*
-%config(noreplace) /etc/glite-lb-dbsetup.sql
 /etc/cron.d/*
-/etc/glite-lb-index.conf.template
 /etc/init.d/glite-lb-bkserverd
-/usr/include/glite/lb/*
 /usr/bin/*
 /usr/sbin/*
 /usr/share/doc/%{name}-%{version}/ChangeLog
@@ -134,6 +130,7 @@ fi
 /usr/share/doc/%{name}-%{version}/glite-lb
 /usr/share/doc/%{name}-%{version}/package.description
 /usr/share/doc/%{name}-%{version}/package.summary
+/usr/share/glite/*
 /usr/share/man/man1/glite-lb-mon-db.1.gz
 /usr/share/man/man8/glite-lb-bkindex.8.gz
 /usr/share/man/man8/glite-lb-bkserverd.8.gz