Geoffroy,
A small patch to oscar-pacakger to reflect new versions. feel free to review
and update the svn.
Best regards,
Olivier.
--
Olivier LAHAYE
Responsable calcul scientifique
CEA DRT/LIST
+33 1 69 08 13 25
Index: oscar-packager/trunk/oscar-packager.spec.in
===================================================================
--- oscar-packager/trunk/oscar-packager.spec.in (révision 9437)
+++ oscar-packager/trunk/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: oscar-packager/trunk/lib/Packager.pm
===================================================================
--- oscar-packager/trunk/lib/Packager.pm (révision 9437)
+++ oscar-packager/trunk/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: oscar-packager/trunk/ChangeLog
===================================================================
--- oscar-packager/trunk/ChangeLog (révision 9437)
+++ oscar-packager/trunk/ChangeLog (copie de travail)
@@ -1,4 +1,8 @@
-1.0 (not yet released):
+1.1:
+- 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: oscar-packager/trunk/etc/Makefile
===================================================================
--- oscar-packager/trunk/etc/Makefile (révision 9437)
+++ oscar-packager/trunk/etc/Makefile (copie de travail)
@@ -16,7 +16,9 @@
core_opkgs_6.0.6.cfg core_stable_6.0.6.cfg \
included_stable_6.0.6.cfg included_opkgs_6.0.6.cfg \
core_opkgs_6.1.0.cfg core_stable_6.1.0.cfg \
- included_stable_6.1.0.cfg included_opkgs_6.1.0.cfg
+ included_stable_6.1.0.cfg included_opkgs_6.1.0.cfg \
+ core_opkgs_6.1.1.cfg core_stable_6.1.1.cfg \
+ included_stable_6.1.1.cfg included_opkgs_6.1.1.cfg
SUBDIRS :=
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Oscar-devel mailing list
Oscar-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oscar-devel
