Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge geant4 changes from root6 branch #3648

Merged
merged 1 commit into from Dec 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion geant4-G4EMLOW.spec
@@ -1,4 +1,4 @@
### RPM external geant4-G4EMLOW 6.48
### RPM external geant4-G4EMLOW 7.3
%define G4RunTime G4LEDATA

## IMPORT geant4-data-rpm
2 changes: 1 addition & 1 deletion geant4-G4ENSDFSTATE.spec
@@ -1,4 +1,4 @@
### RPM external geant4-G4ENSDFSTATE 1.2.3
### RPM external geant4-G4ENSDFSTATE 2.2
%define G4RunTime G4ENSDFSTATEDATA

## IMPORT geant4-data-rpm
2 changes: 1 addition & 1 deletion geant4-G4PhotonEvaporation.spec
@@ -1,4 +1,4 @@
### RPM external geant4-G4PhotonEvaporation 3.2
### RPM external geant4-G4PhotonEvaporation 5.2
%define G4RunTime G4LEVELGAMMADATA

## IMPORT geant4-data-rpm
2 changes: 1 addition & 1 deletion geant4-G4RadioactiveDecay.spec
@@ -1,4 +1,4 @@
### RPM external geant4-G4RadioactiveDecay 4.3.2
### RPM external geant4-G4RadioactiveDecay 5.2
%define G4RunTime G4RADIOACTIVEDATA

## IMPORT geant4-data-rpm
Expand Down
5 changes: 2 additions & 3 deletions geant4.spec
@@ -1,5 +1,5 @@
### RPM external geant4 10.02.p02
%define tag f9e758d95096c7956792a541549515b3c767d1fb
### RPM external geant4 10.04
%define tag b15f6fadadf568e951bbb04c7d55ed4765dfe533
%define branch cms/4.%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
Expand Down Expand Up @@ -66,6 +66,5 @@ find . -name "*.o" -delete
%{relocateConfig}lib/Geant4-*/Geant4Config.cmake
%{relocateConfig}bin/geant4-config
%{relocateConfig}bin/geant4.*
%{relocateConfig}share/Geant4-*/geant4-*
%{relocateConfig}share/Geant4-*/geant4make/geant4make.*
%{relocateConfig}lib/Geant4-*/Geant4LibraryDepends.cmake