Hi,
Here is a fix for the following things:
1/ when building packages like ganglia, don't forget to move rpms like
lib64ganglia-...-x86_64.rpm (rpm whith a name that doesn't start with the
source package name (ganglia in this case).
2/ Update Changelog
3/ Fixes to spec files (see spec file changelog)
PS: Geoffroy, I4ve also updated the version, but if you don't like that, just
keep current version and upgrade the release tag.
Best regards,
Olivier.
--
Olivier LAHAYE
CEA DRT/LIST/DCSI/DIR
Index: oscar-packager.spec.in
===================================================================
--- oscar-packager.spec.in (révision 9457)
+++ oscar-packager.spec.in (copie de travail)
@@ -7,7 +7,7 @@
Summary: OSCAR DatabAse.
Name: oscar-packager
-Version: 1.0
+Version: 1.1
Release: 1
Vendor: Open Cluster Group <http://OSCAR.OpenClusterGroup.org/>
Distribution: OSCAR
@@ -26,10 +26,8 @@
%prep
%setup -n %{name}
-%build
-make install DESTDIR=$RPM_BUILD_ROOT
-
%install
+%__make install DESTDIR=$RPM_BUILD_ROOT
%files
%defattr(-,root,root)
@@ -39,5 +37,12 @@
/etc/oscar/%{name}/*
%changelog
+* Tue May 31 2011 Olivier Lahaye <olivier.lah...@cea.fr> 1.1-1
+- new upstream version (see ChangeLog for more details).
+- moved "make install" into install section to avoid RPM_BUILD_ROOT being erased
+ after install.
+- removed empty build section
+- used __make macro instead of make. makeinstall macro is useless here.
+
* Fri Jan 02 2009 Geoffroy Vallee <valle...@ornl.gov> 1.0-1
- new upstream version (see ChangeLog for more details).
Index: lib/Packager.pm
===================================================================
--- lib/Packager.pm (révision 9457)
+++ lib/Packager.pm (copie de travail)
@@ -347,7 +347,7 @@
return -1;
}
}
- $cmd = "mv $name*.rpm $output";
+ $cmd = "mv *$name*.rpm $output";
print "Executing: $cmd\n";
if (system ($cmd)) {
carp "ERROR: Impossible to execute $cmd";
Index: ChangeLog
===================================================================
--- ChangeLog (révision 9457)
+++ ChangeLog (copie de travail)
@@ -1,4 +1,9 @@
-1.0 (not yet released):
+1.1:
+- Add configuration files dor oscar-6.1.2
+- Add configuration files dor oscar-6.1.1
+1.0:
+- Add configuration file for oscar-6.1.0
+1.0 (pre):
- Add configuration file for oscar-6.0, oscar-6.0.1, and oscar-6.0.2.
- Initial release.
- Allows the creation of binary packages for OSCAR core (stable and unstable)
Index: bin/build_package
===================================================================
--- bin/build_package (révision 9457)
+++ bin/build_package (copie de travail)
@@ -166,11 +166,11 @@
carp "ERROR: Impossible to execute $cmd";
return -1;
}
- @rpms = glob ("$rpm_dir/noarch/$pkg_name*.rpm");
+ @rpms = glob ("$rpm_dir/noarch/*$pkg_name*.rpm");
if (scalar (@rpms) > 0) {
copy_files (\@rpms, $output);
}
- @rpms = glob ("$rpm_dir/$rpm_arch/$pkg_name*.rpm");
+ @rpms = glob ("$rpm_dir/$rpm_arch/*$pkg_name*.rpm");
if (scalar (@rpms) > 0) {
copy_files (\@rpms, $output);
}
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Oscar-devel mailing list
Oscar-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oscar-devel
