rpms/globus-rls-server/EL-5 globus-rls-server.spec, 1.1, 1.2 import.log, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Mon Jun 15 21:20:29 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-rls-server/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14628/EL-5
Modified Files:
globus-rls-server.spec import.log
Log Message:
* Sun Jun 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.7-3
- Update to official Fedora Globus packaging guidelines
Index: globus-rls-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/EL-5/globus-rls-server.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rls-server.spec 6 Jun 2009 03:32:09 -0000 1.1
+++ globus-rls-server.spec 15 Jun 2009 21:19:59 -0000 1.2
@@ -8,7 +8,7 @@ Name: globus-rls-server
%global _name %(tr - _ <<< %{name})
Version: 4.7
%global setupversion 4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Globus Toolkit - Replica Location Service Server
Group: Applications/Internet
@@ -157,10 +157,11 @@ sed s!@sbindir@!%{_sbindir}!g \
$RPM_BUILD_ROOT%{_datadir}/globus/setup/rls-ldif.conf.in > \
$RPM_BUILD_ROOT%{_sysconfdir}/rls-ldif.conf
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
# Remove the SXXrls.in file
rm $RPM_BUILD_ROOT%{_datadir}/globus/setup/SXXrls.in
-sed /SXXrls.in/d \
- -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist
+sed /SXXrls.in/d -i $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist
sed -e 's/"SXXrls", //' -e '/SXXrls/d' \
-i $RPM_BUILD_ROOT%{_datadir}/globus/setup/setup-globus-rls-server.pl
@@ -170,7 +171,7 @@ sed 's!^\(\.TH.*\) 1 !\1 8 !' \
$RPM_BUILD_ROOT%{_mandir}/man8/globus-rls-reporter.8
rm $RPM_BUILD_ROOT%{_mandir}/man1/globus-rls-reporter.1
sed 's!/man1/\(.*\)\.1!/man8/\1.8!' \
- -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+ -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# Install start-up script
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
@@ -185,10 +186,10 @@ install -m 644 -p %{SOURCE3} \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/INSTALL
# Generate package filelists
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
- $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
- $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
- $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist \
| sed -e s!^!%{_prefix}! -e 's!^.*/man/.*!%doc &*!' > package.filelist
%clean
@@ -226,6 +227,9 @@ fi
%doc %{_docdir}/%{name}-%{version}/INSTALL
%changelog
+* Sun Jun 07 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.7-3
+- Update to official Fedora Globus packaging guidelines
+
* Fri Jun 05 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.7-2
- Add Requires needed for scriptlets
- Remove the SXXrls.in file
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 6 Jun 2009 03:32:09 -0000 1.1
+++ import.log 15 Jun 2009 21:19:59 -0000 1.2
@@ -1 +1,2 @@
globus-rls-server-4_7-2_fc9:EL-5:globus-rls-server-4.7-2.fc9.src.rpm:1244259085
+globus-rls-server-4_7-3_fc9:EL-5:globus-rls-server-4.7-3.fc9.src.rpm:1245100778
More information about the fedora-extras-commits
mailing list