Fedora & EPEL: using macros for standard directory names.

diff --git a/emi.canl.canl-c/project/canl-c.spec b/emi.canl.canl-c/project/canl-c.spec
index 4da63d8..4dfea95 100644 (file)
--- a/emi.canl.canl-c/project/canl-c.spec
+++ b/emi.canl.canl-c/project/canl-c.spec
@@ -82,17 +82,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 /usr/share/doc/%{name}-%{version}/*.pdf
-/usr/%{_lib}/libcanl_c.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libcanl_c.so.@MAJOR@
+%{_libdir}/libcanl_c.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libcanl_c.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-/usr/include/*.h
-/usr/%{_lib}/libcanl_c.so
+%{_includedir}/*.h
+%{_libdir}/libcanl_c.so
 
 %files examples
 %defattr(-,root,root)
-/usr/bin/*
+%{_bindir}/*
 
 
 %changelog

diff --git a/org.glite.jobid.api-c/project/glite-jobid-api-c.spec b/org.glite.jobid.api-c/project/glite-jobid-api-c.spec
index dd925cf..22d4a3b 100644 (file)
--- a/org.glite.jobid.api-c/project/glite-jobid-api-c.spec
+++ b/org.glite.jobid.api-c/project/glite-jobid-api-c.spec
@@ -64,16 +64,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/%{_lib}/libglite_jobid.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_jobid.so.@MAJOR@
+%{_libdir}/libglite_jobid.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_jobid.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/jobid
-/usr/include/glite/jobid/strmd5.h
-/usr/include/glite/jobid/cjobid.h
-/usr/%{_lib}/libglite_jobid.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/jobid
+%{_includedir}/glite/jobid/strmd5.h
+%{_includedir}/glite/jobid/cjobid.h
+%{_libdir}/libglite_jobid.so
 
 
 %changelog

diff --git a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
index ee3df04..1409d43 100644 (file)
--- a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
+++ b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
@@ -57,9 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/jobid
-/usr/include/glite/jobid/JobId.h
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/jobid
+%{_includedir}/glite/jobid/JobId.h
 
 
 %changelog

diff --git a/org.glite.lb.client-java/project/glite-lb-client-java.spec b/org.glite.lb.client-java/project/glite-lb-client-java.spec
index f27c5c2..27e1959 100644 (file)
--- a/org.glite.lb.client-java/project/glite-lb-client-java.spec
+++ b/org.glite.lb.client-java/project/glite-lb-client-java.spec
@@ -68,9 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/%{_lib}/libglite_lb_sendviasocket.so
-/usr/%{_lib}/libglite_lb_sendviasocket.so.0
-/usr/%{_lib}/libglite_lb_sendviasocket.so.0.0.0
+%{_libdir}/libglite_lb_sendviasocket.so
+%{_libdir}/libglite_lb_sendviasocket.so.0
+%{_libdir}/libglite_lb_sendviasocket.so.0.0.0
 /usr/share/java/lb-client-java.jar
 /usr/share/java/lb-client-java-examples.jar
 

diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec
index f57ce4d..4fb93f2 100644 (file)
--- a/org.glite.lb.client/project/glite-lb-client.spec
+++ b/org.glite.lb.client/project/glite-lb-client.spec
@@ -83,10 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
-/usr/%{_lib}/libglite_lb_client.so.11.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lb_client.so.11
-/usr/%{_lib}/libglite_lb_clientpp.so.11.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lb_clientpp.so.11
+%{_libdir}/libglite_lb_client.so.11.@MINOR@.@REVISION@
+%{_libdir}/libglite_lb_client.so.11
+%{_libdir}/libglite_lb_clientpp.so.11.@MINOR@.@REVISION@
+%{_libdir}/libglite_lb_clientpp.so.11
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/share/doc/%{name}-%{version}/README-notify
@@ -99,11 +99,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/emi/build/
 %dir /usr/share/emi/build/m4/
 %dir /usr/share/doc/%{name}-%{version}/examples/
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
-/usr/include/glite/lb/*.h
-/usr/%{_lib}/libglite_lb_client.so
-/usr/%{_lib}/libglite_lb_clientpp.so
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/lb/
+%{_includedir}/glite/lb/*.h
+%{_libdir}/libglite_lb_client.so
+%{_libdir}/libglite_lb_clientpp.so
 /usr/share/doc/%{name}-%{version}/examples/*
 /usr/share/emi/build/m4/glite_lb.m4
 /usr/share/man/man1/glite-lb-notify.1.gz
@@ -115,10 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
-/usr/bin/glite-lb-logevent
-/usr/bin/glite-lb-notify
-/usr/bin/glite-lb-register_sandbox
-/usr/%{_lib}/glite-lb/examples/*
+%{_bindir}/glite-lb-logevent
+%{_bindir}/glite-lb-notify
+%{_bindir}/glite-lb-register_sandbox
+%{_libdir}/glite-lb/examples/*
 
 
 %changelog

diff --git a/org.glite.lb.common/project/glite-lb-common.spec b/org.glite.lb.common/project/glite-lb-common.spec
index 7a51c8c..d1df097 100644 (file)
--- a/org.glite.lb.common/project/glite-lb-common.spec
+++ b/org.glite.lb.common/project/glite-lb-common.spec
@@ -81,15 +81,15 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/package.description
 /usr/share/doc/%{name}-%{version}/package.summary
-/usr/%{_lib}/libglite_lb_common.so.13.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lb_common.so.13
+%{_libdir}/libglite_lb_common.so.13.@MINOR@.@REVISION@
+%{_libdir}/libglite_lb_common.so.13
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
-/usr/include/glite/lb/*
-/usr/%{_lib}/libglite_lb_common.so
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/lb/
+%{_includedir}/glite/lb/*
+%{_libdir}/libglite_lb_common.so
 
 
 %changelog

diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index 05429f3..b72f5f1 100644 (file)
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -90,9 +90,9 @@ fi
 %dir /usr/share/glite/
 %dir /usr/share/doc/%{name}-%{version}/
 /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
+%{_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}/README
 /usr/share/glite/*
 /usr/share/man/man1/glite-lb-harvester.1.gz

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 0c7095f..03a9368 100644 (file)
--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
@@ -61,10 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/%{_lib}/glite-lb/examples/
 %dir /usr/share/doc/%{name}-%{version}/
 /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
+%{_libdir}/activemq_cpp_plugin.so
+%{_libdir}/activemq_cpp_plugin.so.0
+%{_libdir}/activemq_cpp_plugin.so.0.0.0
+%{_libdir}/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

diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index 85495b3..70d23bc 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -96,9 +96,9 @@ fi
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
 /etc/init.d/glite-lb-locallogger
-/usr/bin/glite-lb-notif-interlogd
-/usr/bin/glite-lb-interlogd
-/usr/bin/glite-lb-logd
+%{_bindir}/glite-lb-notif-interlogd
+%{_bindir}/glite-lb-interlogd
+%{_bindir}/glite-lb-logd
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/share/doc/%{name}-%{version}/package.description
@@ -108,9 +108,9 @@ fi
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
-/usr/include/glite/lb/*.h
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/lb/
+%{_includedir}/glite/lb/*.h
 
 
 %changelog

diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index f3ef937..9ca075c 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -124,7 +124,7 @@ fi
 %config(noreplace missingok) /etc/sysconfig/glite-lb
 /etc/cron.d/*
 /etc/init.d/glite-lb-bkserverd
-/usr/bin/*
+%{_bindir}/*
 /usr/sbin/*
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE

diff --git a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
index e5a8f76..8cf9c3c 100644 (file)
--- a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
+++ b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
@@ -73,19 +73,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/%{_lib}/libglite_lb_statemachine.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lb_statemachine.so.@MAJOR@
-/usr/%{_lib}/glite_lb_plugin.so.0
-/usr/%{_lib}/glite_lb_plugin.so.0.0.0
+%{_libdir}/libglite_lb_statemachine.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_lb_statemachine.so.@MAJOR@
+%{_libdir}/glite_lb_plugin.so.0
+%{_libdir}/glite_lb_plugin.so.0.0.0
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/lb/
 %dir /usr/interface/
-/usr/%{_lib}/glite_lb_plugin.so
-/usr/%{_lib}/libglite_lb_statemachine.so
-/usr/include/glite/lb/*.h
+%{_libdir}/glite_lb_plugin.so
+%{_libdir}/libglite_lb_statemachine.so
+%{_includedir}/glite/lb/*.h
 /usr/interface/*.xsd
 
 

diff --git a/org.glite.lb.types/project/glite-lb-types.spec b/org.glite.lb.types/project/glite-lb-types.spec
index c6e8d40..10d0f6e 100644 (file)
--- a/org.glite.lb.types/project/glite-lb-types.spec
+++ b/org.glite.lb.types/project/glite-lb-types.spec
@@ -45,9 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/perl/
 %dir /usr/share/perl/gLite/
 %dir /usr/share/perl/gLite/LB/
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
-/usr/include/glite/lb/*
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/lb/
+%{_includedir}/glite/lb/*
 /usr/sbin/glite-lb-at3
 /usr/sbin/glite-lb-check_version.pl
 /usr/share/perl/gLite/LB/StructField.pm

diff --git a/org.glite.lb.utils/project/glite-lb-utils.spec b/org.glite.lb.utils/project/glite-lb-utils.spec
index d1b39c1..f33b8cd 100644 (file)
--- a/org.glite.lb.utils/project/glite-lb-utils.spec
+++ b/org.glite.lb.utils/project/glite-lb-utils.spec
@@ -53,14 +53,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
-/usr/bin/glite-lb-bkpurge-offline
-/usr/bin/glite-lb-dump
-/usr/bin/glite-lb-dump_exporter
-/usr/bin/glite-lb-load
-/usr/bin/glite-lb-mon
-/usr/bin/glite-lb-purge
-/usr/bin/glite-lb-state_history
-/usr/bin/glite-lb-statistics
+%{_bindir}/glite-lb-bkpurge-offline
+%{_bindir}/glite-lb-dump
+%{_bindir}/glite-lb-dump_exporter
+%{_bindir}/glite-lb-load
+%{_bindir}/glite-lb-mon
+%{_bindir}/glite-lb-purge
+%{_bindir}/glite-lb-state_history
+%{_bindir}/glite-lb-statistics
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/share/doc/%{name}-%{version}/package.description

diff --git a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
index eddee9f..b0a01b1 100644 (file)
--- a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
+++ b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
@@ -44,12 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/lb/
 %dir /usr/share/doc/%{name}-%{version}/
 %dir /usr/share/wsdl/
 %dir /usr/share/wsdl/glite-lb/
-/usr/include/glite/lb/ws_interface_version.h
+%{_includedir}/glite/lb/ws_interface_version.h
 /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/package.summary

diff --git a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
index f544f2c..0026342 100644 (file)
--- a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
+++ b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
@@ -50,11 +50,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/
-/usr/%{_lib}/glite-lb/examples/glite-lb-ws_getversion
-/usr/%{_lib}/glite-lb/examples/glite-lb-ws_joblog
-/usr/%{_lib}/glite-lb/examples/glite-lb-ws_lb4agu_GetActivityStatus
-/usr/%{_lib}/glite-lb/examples/glite-lb-ws_jobstat
-/usr/%{_lib}/glite-lb/examples/glite-lb-ws_lb4agu_GetActivityInfo
+%{_libdir}/glite-lb/examples/glite-lb-ws_getversion
+%{_libdir}/glite-lb/examples/glite-lb-ws_joblog
+%{_libdir}/glite-lb/examples/glite-lb-ws_lb4agu_GetActivityStatus
+%{_libdir}/glite-lb/examples/glite-lb-ws_jobstat
+%{_libdir}/glite-lb/examples/glite-lb-ws_lb4agu_GetActivityInfo
 
 
 %changelog

diff --git a/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec b/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec
index 7ae3c0f..779e505 100644 (file)
--- a/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec
+++ b/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec
@@ -70,15 +70,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %doc /usr/share/doc/%{name}-%{version}/LICENSE
-/usr/%{_lib}/libglite_lbu_db.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lbu_db.so.@MAJOR@
+%{_libdir}/libglite_lbu_db.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_lbu_db.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/lbu
-/usr/include/glite/lbu/db.h
-/usr/%{_lib}/libglite_lbu_db.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/lbu
+%{_includedir}/glite/lbu/db.h
+%{_libdir}/libglite_lbu_db.so
 
 
 %changelog

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
index a2074d8..9262678 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
+++ b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
@@ -79,18 +79,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %doc /usr/share/doc/%{name}-%{version}/LICENSE
-/usr/%{_lib}/libglite_security_gsoap_plugin_*.so.9.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_security_gsoap_plugin_*.so.9
+%{_libdir}/libglite_security_gsoap_plugin_*.so.9.@MINOR@.@REVISION@
+%{_libdir}/libglite_security_gsoap_plugin_*.so.9
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/security
-/usr/include/glite/security/glite_gscompat.h
-/usr/include/glite/security/glite_gsplugin.h
-/usr/include/glite/security/glite_gsplugin-int.h
-/usr/%{_lib}/libglite_security_gsoap_plugin_*.so
-/usr/%{_lib}/pkgconfig/*.pc
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/security
+%{_includedir}/glite/security/glite_gscompat.h
+%{_includedir}/glite/security/glite_gsplugin.h
+%{_includedir}/glite/security/glite_gsplugin-int.h
+%{_libdir}/libglite_security_gsoap_plugin_*.so
+%{_libdir}/pkgconfig/*.pc
 
 
 %changelog

diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
index 245b84b..7534e65 100644 (file)
--- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
+++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
@@ -92,16 +92,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %doc /usr/share/doc/%{name}-%{version}/LICENSE
-/usr/%{_lib}/libglite_security_gss.so.9.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_security_gss.so.9
+%{_libdir}/libglite_security_gss.so.9.@MINOR@.@REVISION@
+%{_libdir}/libglite_security_gss.so.9
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/security
-/usr/include/glite/security/glite_gss.h
-/usr/%{_lib}/libglite_security_gss.so
-/usr/%{_lib}/pkgconfig/*.pc
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/security
+%{_includedir}/glite/security/glite_gss.h
+%{_libdir}/libglite_security_gss.so
+%{_libdir}/pkgconfig/*.pc
 
 
 %changelog

diff --git a/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec b/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec
index 28f06d1..a5b87cf 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec
+++ b/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec
@@ -65,23 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/%{_lib}/libglite_jp_common.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_jp_common.so.@MAJOR@
+%{_libdir}/libglite_jp_common.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_jp_common.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/jp
-/usr/include/glite/jp/types.h
-/usr/include/glite/jp/indexdb.h
-/usr/include/glite/jp/attr.h
-/usr/include/glite/jp/file_plugin.h
-/usr/include/glite/jp/context.h
-/usr/include/glite/jp/type_plugin.h
-/usr/include/glite/jp/backend.h
-/usr/include/glite/jp/known_attr.h
-/usr/include/glite/jp/builtin_plugins.h
-/usr/%{_lib}/libglite_jp_common.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/jp
+%{_includedir}/glite/jp/types.h
+%{_includedir}/glite/jp/indexdb.h
+%{_includedir}/glite/jp/attr.h
+%{_includedir}/glite/jp/file_plugin.h
+%{_includedir}/glite/jp/context.h
+%{_includedir}/glite/jp/type_plugin.h
+%{_includedir}/glite/jp/backend.h
+%{_includedir}/glite/jp/known_attr.h
+%{_includedir}/glite/jp/builtin_plugins.h
+%{_libdir}/libglite_jp_common.so
 
 
 %changelog

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 e3d5a4f..125dea1 100644 (file)
--- a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
+++ b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
@@ -69,15 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc /usr/share/doc/%{name}-%{version}/README
 %doc /usr/share/doc/%{name}-%{version}/log4crc.example-debugging
 %doc /usr/share/doc/%{name}-%{version}/log4crc.example-production
-/usr/%{_lib}/libglite_lbu_log.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lbu_log.so.@MAJOR@
+%{_libdir}/libglite_lbu_log.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_lbu_log.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/lbu
-/usr/include/glite/lbu/log.h
-/usr/%{_lib}/libglite_lbu_log.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/lbu
+%{_includedir}/glite/lbu/log.h
+%{_libdir}/libglite_lbu_log.so
 
 
 %changelog

diff --git a/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec b/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec
index dc1a7e9..c65ca1f 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec
+++ b/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec
@@ -61,15 +61,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/%{_lib}/libglite_lbu_maildir.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lbu_maildir.so.@MAJOR@
+%{_libdir}/libglite_lbu_maildir.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_lbu_maildir.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/lbu
-/usr/include/glite/lbu/maildir.h
-/usr/%{_lib}/libglite_lbu_maildir.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/lbu
+%{_includedir}/glite/lbu/maildir.h
+%{_libdir}/libglite_lbu_maildir.so
 
 
 %changelog

diff --git a/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec b/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec
index c03fdd4..20e4888 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec
+++ b/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec
@@ -62,15 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/%{_lib}/libglite_lbu_server_bones.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lbu_server_bones.so.@MAJOR@
+%{_libdir}/libglite_lbu_server_bones.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_lbu_server_bones.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/lbu
-/usr/include/glite/lbu/srvbones.h
-/usr/%{_lib}/libglite_lbu_server_bones.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/lbu
+%{_includedir}/glite/lbu/srvbones.h
+%{_libdir}/libglite_lbu_server_bones.so
 
 
 %changelog

diff --git a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec
index 33e82f0..871d918 100644 (file)
--- a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec
+++ b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec
@@ -65,16 +65,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %doc /usr/share/doc/%{name}-%{version}/LICENSE
-/usr/%{_lib}/libglite_lbu_trio.so.@MAJOR@.@MINOR@.@REVISION@
-/usr/%{_lib}/libglite_lbu_trio.so.@MAJOR@
+%{_libdir}/libglite_lbu_trio.so.@MAJOR@.@MINOR@.@REVISION@
+%{_libdir}/libglite_lbu_trio.so.@MAJOR@
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite
-%dir /usr/include/glite/lbu
-/usr/include/glite/lbu/escape.h
-/usr/include/glite/lbu/trio.h
-/usr/%{_lib}/libglite_lbu_trio.so
+%dir %{_includedir}/glite
+%dir %{_includedir}/glite/lbu
+%{_includedir}/glite/lbu/escape.h
+%{_includedir}/glite/lbu/trio.h
+%{_libdir}/libglite_lbu_trio.so
 
 
 %changelog

diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
index bb8642a..146bc02 100644 (file)
--- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
+++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
@@ -121,23 +121,23 @@ fi
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
 /usr/share/doc/%{name}-%{version}/LICENSE
-/usr/%{_lib}/libglite_security_proxyrenewal.so.*
-/usr/%{_lib}/libglite_security_proxyrenewal_core.so.*
+%{_libdir}/libglite_security_proxyrenewal.so.*
+%{_libdir}/libglite_security_proxyrenewal_core.so.*
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/include/glite/
-%dir /usr/include/glite/security/
-%dir /usr/include/glite/security/proxyrenewal/
-/usr/include/glite/security/proxyrenewal/*.h
-/usr/%{_lib}/libglite_security_proxyrenewal.so
-/usr/%{_lib}/libglite_security_proxyrenewal_core.so
+%dir %{_includedir}/glite/
+%dir %{_includedir}/glite/security/
+%dir %{_includedir}/glite/security/proxyrenewal/
+%{_includedir}/glite/security/proxyrenewal/*.h
+%{_libdir}/libglite_security_proxyrenewal.so
+%{_libdir}/libglite_security_proxyrenewal_core.so
 
 %files progs
 %defattr(-,root,root)
 /etc/init.d/glite-proxy-renewald
-/usr/bin/glite-proxy-renew
-/usr/bin/glite-proxy-renewd
+%{_bindir}/glite-proxy-renew
+%{_bindir}/glite-proxy-renewd
 /usr/share/man/man1/glite-proxy-renew.1.gz
 /usr/share/man/man8/glite-proxy-renewd.8.gz