From 2820ea689d2edfb963af8ce94af9c9f216b44016 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 22 Feb 2012 09:01:04 +0000 Subject: [PATCH] Packaging improvements (rpmlint and lintian checks): - debug symbols and library permissions - proper provides - typos (dependencies, description) - logrotate file name - missing rpath removal --- org.glite.jobid.api-c/Makefile | 6 +++--- org.glite.lb.client-java/project/package.description | 2 +- org.glite.lb.client-java/src_c/Makefile | 2 +- org.glite.lb.client/Makefile | 14 +++++++------- org.glite.lb.common/Makefile | 6 +++--- org.glite.lb.logger-msg/Makefile | 8 +++++++- org.glite.lb.logger-msg/project/debian.control | 2 +- org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec | 1 + org.glite.lb.server/Makefile | 3 +-- org.glite.lb.server/config/glite-lb-lcas.logrotate | 5 ----- org.glite.lb.server/config/glite-lb-purge.logrotate | 5 ----- org.glite.lb.server/config/glite-lb-server.logrotate | 11 +++++++++++ org.glite.lb.server/project/glite-lb-server.spec | 3 +-- org.glite.lb.state-machine/Makefile | 16 ++++++---------- .../project/glite-lb-ws-interface.spec | 2 +- org.glite.lb.yaim/project/glite-lb-yaim.spec | 1 + .../project/glite-lbjp-common-log.spec | 2 +- org.glite.lbjp-common.maildir/project/debian.control | 2 +- org.glite.lbjp-common.server-bones/Makefile | 6 +++--- org.glite.lbjp-common.trio/Makefile | 7 ++++--- .../project/glite-px-proxyrenewal.spec | 5 ++--- 21 files changed, 56 insertions(+), 53 deletions(-) delete mode 100644 org.glite.lb.server/config/glite-lb-lcas.logrotate delete mode 100644 org.glite.lb.server/config/glite-lb-purge.logrotate create mode 100644 org.glite.lb.server/config/glite-lb-server.logrotate diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile index c403eed..b72e1a9 100644 --- a/org.glite.jobid.api-c/Makefile +++ b/org.glite.jobid.api-c/Makefile @@ -21,7 +21,7 @@ DEBUG:=-g -O0 -Wall CFLAGS:=${DEBUG} \ -I${top_srcdir}/interface -I${top_srcdir}/src \ ${COVERAGE_FLAGS} \ - -D_GNU_SOURCE + -D_GNU_SOURCE ${CFLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS} @@ -78,11 +78,11 @@ stage: install: ${LIB} mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix} - ${INSTALL} -m 644 ${LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} (cd ${top_srcdir}/interface; ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${jobidprefix}) -%.o: %.c +%.lo %.o: %.c ${COMPILE} -o $@ -c $< diff --git a/org.glite.lb.client-java/project/package.description b/org.glite.lb.client-java/project/package.description index 40fc623..98d3fb4 100644 --- a/org.glite.lb.client-java/project/package.description +++ b/org.glite.lb.client-java/project/package.description @@ -1 +1 @@ -JAVA implemantation of the L&B service client. Supports producing (logging) events into L&B, event and job status queries, and receiving notifications. +JAVA implementation of the L&B service client. Supports producing (logging) events into L&B, event and job status queries, and receiving notifications. diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile index 8a00142..a9cc9e3 100755 --- a/org.glite.lb.client-java/src_c/Makefile +++ b/org.glite.lb.client-java/src_c/Makefile @@ -21,7 +21,7 @@ VPATH=${topdir}/src_c compile: ${LIB} ${LIB}: ${OBJ} - libtool --mode=link ${CC} -rpath ${PREFIX}${prefix}/${libdir} -o $@ ${OBJ} + libtool --mode=link ${CC} -rpath ${PREFIX}${prefix}/${libdir} -o $@ ${OBJ} -lm %.lo: %.c libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include ${JDK_CPPFLAGS} -c $< diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index d6c77b6..8a911a1 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -97,13 +97,13 @@ COMMON_LIB_THR:=-lglite_lb_common_${thrflavour} COMMON_LIB:=-lglite_lb_common TRIO_LIB:=-lglite_lbu_trio -CFLAGS:=${CFLAGS} ${DEBUG} \ +CFLAGS:=${DEBUG} \ -I. \ -I${top_srcdir}/src -I${top_srcdir}/interface \ -I${stagedir}${prefix}/include \ ${COVERAGE_FLAGS} \ -DBUILDING_LB_CLIENT \ - -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} + -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} ${CFLAGS} CXXFLAGS:=${CFLAGS} @@ -282,7 +282,7 @@ perftest_logjobs.o: perftest_logjobs.c ${CC} ${CFLAGS} -DLB_PERF_DROP -c $< # catches $TOOLS and logevent compilation -%.o: %.c +%.lo %.o: %.c ${CC} ${CFLAGS} -c $< %.h: %.h.T @@ -290,7 +290,7 @@ perftest_logjobs.o: perftest_logjobs.c ${AT3} $< >$@ || ( rm -f $@; false ) chmod -w $@ >/dev/null -%.o: %.cpp +%.lo %.o: %.cpp ${CXX} ${CFLAGS} ${GLOBUSINC} -c $< %.c: %.c.T @@ -354,11 +354,11 @@ install: mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8 mkdir -p ${DESTDIR}${m4dir} ifdef LB_STANDALONE - ${INSTALL} -m 644 ${c_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${c_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} else - ${INSTALL} -m 644 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} if test -n "${staging}"; then \ - install -m 644 ${plus_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}; \ + install -m 755 ${plus_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}; \ fi endif ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 4aa041e..215d1cc 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -153,7 +153,7 @@ ${STATICLIB}: ${THROBJS} ranlib $@ ${LTLIB}: ${THROBJS} - ${LINKXX} ${version_info} -o $@ ${THRLOBJS} \ + ${LINK} ${version_info} -o $@ ${THRLOBJS} \ -lglite_security_gss \ ${EXT_LIBS} \ -lm @@ -167,13 +167,13 @@ ${THRSTATICLIB}: ${THROBJS} ranlib $@ ${NOTHRLTLIB}: ${OBJS} - ${LINKXX} ${version_info} -o $@ ${LOBJS} \ + ${LINK} ${version_info} -o $@ ${LOBJS} \ -lglite_security_gss_${nothrflavour} \ ${EXT_LIBS} \ -lm ${THRLTLIB}: ${THROBJS} - ${LINKXX} ${version_info} -o $@ ${THRLOBJS} \ + ${LINK} ${version_info} -o $@ ${THRLOBJS} \ -lglite_security_gss_${thrflavour} \ ${EXT_LIBS} \ -lm diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile index df397eb..b7c9542 100644 --- a/org.glite.lb.logger-msg/Makefile +++ b/org.glite.lb.logger-msg/Makefile @@ -68,12 +68,18 @@ PLUGIN_LIB:=activemq_cpp_plugin.la EXAMPLES=glite-lb-cmsclient +ifeq (${thrflavour},) +default_flavour= +else +default_flavour=_${nothrflavour} +endif + default: all all compile: ${PLUGIN_LIB} ${EXAMPLES} ${PLUGIN_LIB}: ${PLUGIN_LOBJS} - ${SOLINK} -o $@ ${PLUGIN_LOBJS} ${EXT_LIB} + ${SOLINK} -o $@ ${PLUGIN_LOBJS} ${EXT_LIB} -lglite_lb_common${default_flavour} -lglite_jobid -lglite_lbu_log ${MAN_GZ}: ${MAN} rm -f ${MAN_GZ} ${MAN} diff --git a/org.glite.lb.logger-msg/project/debian.control b/org.glite.lb.logger-msg/project/debian.control index efd87f3..f94b617 100644 --- a/org.glite.lb.logger-msg/project/debian.control +++ b/org.glite.lb.logger-msg/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-logger-msg Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-logger-dev, libcppunit-dev, libglite-lbjp-common-trio-dev, libtool +Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-logger-dev, libcppunit-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool #TODO: activemq-cpp-library Standards-Version: 3.9.1 Section: misc 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 6a34124..d6dfe90 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 @@ -9,6 +9,7 @@ Group: System Environment/Daemons BuildRequires: activemq-cpp-library BuildRequires: cppunit-devel%{?_isa} BuildRequires: glite-lb-logger-devel%{?_isa} +BuildRequires: glite-lbjp-common-log-devel%{?_isa} BuildRequires: glite-lbjp-common-trio-devel%{?_isa} BuildRequires: libtool Requires: glite-lb-logger diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 764151d..3e91ad0 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -376,8 +376,7 @@ install: ${INSTALL} -m 644 glite-lb-server-purge.cron ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-server-purge ${INSTALL} -m 644 glite-lb-proxy-purge.cron ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-proxy-purge ${INSTALL} -m 644 glite-lb-notif-keeper.cron ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-notif-keeper - ${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-purge.logrotate ${DESTDIR}${PREFIX}${sysconfdir}/logrotate.d/glite-lb-purge - ${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-lcas.logrotate ${DESTDIR}${PREFIX}${sysconfdir}/logrotate.d/glite-lb-lcas + ${INSTALL} -m 644 ${top_srcdir}/config/glite-lb-server.logrotate ${DESTDIR}${PREFIX}${sysconfdir}/logrotate.d/glite-lb-server ${INSTALL} -m 644 ${top_srcdir}/config/my.cnf ${DESTDIR}${PREFIX}${sysconfdir}/mysql/conf.d/glite-lb-server.cnf mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} diff --git a/org.glite.lb.server/config/glite-lb-lcas.logrotate b/org.glite.lb.server/config/glite-lb-lcas.logrotate deleted file mode 100644 index cf17dfa..0000000 --- a/org.glite.lb.server/config/glite-lb-lcas.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/glite/glite-lb-server-lcas.log { - daily - rotate 4 - missingok -} diff --git a/org.glite.lb.server/config/glite-lb-purge.logrotate b/org.glite.lb.server/config/glite-lb-purge.logrotate deleted file mode 100644 index 5f725ca..0000000 --- a/org.glite.lb.server/config/glite-lb-purge.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/glite/glite-lb-server-purge.log /var/log/glite-lb-server-purge-proxy.log { - weekly - rotate 4 - missingok -} diff --git a/org.glite.lb.server/config/glite-lb-server.logrotate b/org.glite.lb.server/config/glite-lb-server.logrotate new file mode 100644 index 0000000..43c3c1a --- /dev/null +++ b/org.glite.lb.server/config/glite-lb-server.logrotate @@ -0,0 +1,11 @@ +/var/log/glite/glite-lb-server-lcas.log { + daily + rotate 4 + missingok +} + +/var/log/glite/glite-lb-server-purge.log /var/log/glite/glite-lb-server-purge-proxy.log { + weekly + rotate 4 + missingok +} diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec index 1938f20..e694fe0 100644 --- a/org.glite.lb.server/project/glite-lb-server.spec +++ b/org.glite.lb.server/project/glite-lb-server.spec @@ -116,8 +116,7 @@ fi %dir /usr/include/glite/ %dir /usr/include/glite/lb/ %dir /usr/share/doc/%{name}-%{version}/ -%config(noreplace) /etc/logrotate.d/glite-lb-purge -%config(noreplace) /etc/logrotate.d/glite-lb-lcas +%config(noreplace) /etc/logrotate.d/glite-lb-server %config(noreplace) /etc/mysql/conf.d/glite-lb-server.cnf /etc/cron.d/* /etc/glite-lb-index.conf.template diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index 18eb1c2..20b1456 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -35,11 +35,11 @@ EXPAT_LIBS?=${expatlib} -lexpat DEBUG:=-g -O0 -Wall -CFLAGS:= ${CFLAGS} \ +CFLAGS:= \ ${DEBUG} \ ${CLASSADS_CFLAGS} \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ - -I${top_srcdir}/interface + -I${top_srcdir}/interface ${CFLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} @@ -54,9 +54,8 @@ default_flavour= else default_flavour=_${nothrflavour} endif -COMMON_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} -lglite_security_gss${defaultflavour} -PLUGIN_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} \ - ${CLASSADS_LIBS} -lstdc++ ${EXPAT_LIBS} +COMMON_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} -lglite_security_gss${defaultflavour} -lglite_jobid +PLUGIN_LIBS:= -L${stagedir}${prefix}/${libdir} -lglite_lb_common${default_flavour} PLUGIN_LOBJS:=seqcode_aux.lo process_event.lo process_event_pbs.lo process_event_condor.lo process_event_cream.lo lb_plugin.lo process_event_file_transfer.lo process_event_file_transfer_collection.lo MACHINE_OBJS:=seqcode_aux.o process_event.o process_event_pbs.o process_event_condor.o process_event_cream.o process_event_file_transfer.o process_event_file_transfer_collection.o intjobstat_supp.o @@ -89,7 +88,7 @@ ${PLUGIN_LIB}: ${PLUGIN_LOBJS} ${SOLINK} -o $@ ${PLUGIN_LOBJS} ${PLUGIN_LIBS} ${MACHINE_LIB}: ${MACHINE_OBJS} - ${LINK} ${version_info} -o $@ ${MACHINE_LOBJS} + ${LINK} ${version_info} -o $@ ${MACHINE_LOBJS} ${COMMON_LIBS} # ar crv $@ ${MACHINE_OBJS} # -ranlib $@ @@ -101,7 +100,7 @@ stage: compile install: -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} ${DESTDIR}${PREFIX}${prefix}/interface ${DESTDIR}${PREFIX}${prefix}/include/glite/lb - ${INSTALL} -m 644 ${MACHINE_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${MACHINE_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} ${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} install -m 644 ${top_srcdir}/interface/lb-job-attrs.xsd ${DESTDIR}${PREFIX}${prefix}/interface install -m 644 lb-job-attrs2.xsd ${DESTDIR}${PREFIX}${prefix}/interface @@ -141,9 +140,6 @@ check: %.o %.lo: %.c ${COMPILE} -c $< -%.lo: %.c - ${COMPILE} -o $@ -c $< - lb_plugin.lo: lb_plugin.c job_attrs.h job_attrs2.h ${COMPILE} -DPLUGIN_DEBUG -o $@ -c $< 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 fa678cc..9a3374d 100644 --- a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec +++ b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec @@ -5,7 +5,7 @@ Release: @AGE@%{?dist} Url: @URL@ License: ASL 2.0 Vendor: EMI -Group: System Environment/Libraries +Group: Development/Libraries BuildArch: noarch BuildRequires: glite-lb-types BuildRequires: libxslt diff --git a/org.glite.lb.yaim/project/glite-lb-yaim.spec b/org.glite.lb.yaim/project/glite-lb-yaim.spec index d5b9814..05188b4 100644 --- a/org.glite.lb.yaim/project/glite-lb-yaim.spec +++ b/org.glite.lb.yaim/project/glite-lb-yaim.spec @@ -11,6 +11,7 @@ Requires: glite-yaim-bdii Requires: perl-LDAP Requires: glite-yaim-core Obsoletes: glite-yaim-lb <= 4.2.1-1 +Provides: glite-yaim-lb = %{version}-%{release} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: yes Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/@MODULE@/%{version}/src/%{name}-@VERSION@.src.tar.gz 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 690c36c..a6b193f 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 @@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /usr/share/doc/%{name}-%{version} %dir /etc/glite-lb -%config /etc/glite-lb/log4crc +%config(noreplace) /etc/glite-lb/log4crc %doc /usr/share/doc/%{name}-%{version}/LICENSE %doc /usr/share/doc/%{name}-%{version}/README %doc /usr/share/doc/%{name}-%{version}/log4crc.example-debugging diff --git a/org.glite.lbjp-common.maildir/project/debian.control b/org.glite.lbjp-common.maildir/project/debian.control index 36da425..0196c21 100644 --- a/org.glite.lbjp-common.maildir/project/debian.control +++ b/org.glite.lbjp-common.maildir/project/debian.control @@ -29,7 +29,7 @@ Package: glite-lbjp-common-maildir-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lb2-maildir2 (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-maildir2 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP common maildir library debugging symbols This package contains debugging symbols for gLite L&B/JP common maildir library. diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile index 730f6e2..744b7cc 100644 --- a/org.glite.lbjp-common.server-bones/Makefile +++ b/org.glite.lbjp-common.server-bones/Makefile @@ -18,10 +18,10 @@ version=${module.version} VPATH=${top_srcdir}/src:${top_srcdir}/examples DEBUG:=-g -O0 -Wall -CFLAGS:= ${CFLAGS} ${DEBUG} \ +CFLAGS:=${DEBUG} \ -I${top_srcdir}/interface \ -I${stagedir}${prefix}/include \ - -D_GNU_SOURCE + -D_GNU_SOURCE ${CFLAGS} LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} ifdef LB_PROF @@ -86,7 +86,7 @@ doc: install: mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} - ${INSTALL} -m 644 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} ${INSTALL} -m 644 ${STATICLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} ; \ cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile index e5d13e5..b703d3f 100644 --- a/org.glite.lbjp-common.trio/Makefile +++ b/org.glite.lbjp-common.trio/Makefile @@ -22,7 +22,7 @@ CC=gcc DEBUG:=-g -O0 -Wall -CFLAGS:=${CFLAGS} ${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface -I. -DDATAGRID_EXTENSION +CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface -I. -DDATAGRID_EXTENSION ${CFLAGS} COMPILE:=libtool --mode=compile ${CC} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} @@ -108,7 +108,8 @@ install: all -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbuprefix} - ${INSTALL} -m 644 ${LTLIB} ${STATICLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 755 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} + ${INSTALL} -m 644 ${STATICLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir} ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} (cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbuprefix}) @@ -119,5 +120,5 @@ clean: distclean: rm -rvf Makefile.inc *.spec debian/ -%.o: %.c +%.lo %.o: %.c ${COMPILE} ${CFLAGS} -c $< diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec index 0874d27..c9b0e50 100644 --- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec +++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec @@ -1,4 +1,4 @@ -Summary: Virtual package with runtime and development files of gLite proxyrenewal +Summary: Virtual package with run-time and development files of gLite proxyrenewal Name: glite-px-proxyrenewal Version: @MAJOR@.@MINOR@.@REVISION@ Release: @AGE@%{?dist} @@ -14,14 +14,13 @@ BuildRequires: voms-devel%{?_isa} Requires: %{name}-devel%{?_isa} Requires: %{name}-progs Obsoletes: glite-security-proxyrenewal%{?_isa} <= 1.3.11-4 -Provides: %{name}%{?_isa} = %{version}-%{release} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: yes Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/@MODULE@/%{version}/src/%{name}-@VERSION@.src.tar.gz %description -This is a virtual package providing runtime and development files for gLite +This is a virtual package providing run-time and development files for gLite proxyrenewal. -- 1.8.2.3