Changeset 29638 for main/trunk/package-kits
- Timestamp:
- 2014-12-15T15:56:33+13:00 (9 years ago)
- Location:
- main/trunk/package-kits/linux
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/package-kits/linux/distros/arch
r29607 r29638 11 11 TOMCAT_USER: tomcat7 12 12 GLI: %GREENSTONE_HOME%/gli 13 14 ARCH_NATIVE:15 'x86_64'16 'i686'17 18 ARCH_ANY:19 'any'20 13 21 14 PKG_SVN: -
main/trunk/package-kits/linux/distros/fedora
r29607 r29638 11 11 TOMCAT_USER: tomcat 12 12 GLI: %GREENSTONE_HOME%/gli 13 14 ARCH_NATIVE:15 x86_6416 i68617 18 ARCH_ANY:19 any20 13 21 14 PKG_SVN: -
main/trunk/package-kits/linux/distros/ubuntu
r29607 r29638 11 11 TOMCAT_USER: tomcat7 12 12 GLI: %GREENSTONE_HOME%/gli 13 14 ARCH_NATIVE:15 any16 17 ARCH_ANY:18 all19 13 20 14 PKG_SVN: -
main/trunk/package-kits/linux/managers/apt/conf
r29607 r29638 1 1 BUILD_LIB_DIR: %SYSTEMLIB% 2 2 BUILD_BIN_DIR: %SYSTEMBIN% 3 4 ARCH_NATIVE: any 5 ARCH_ANY: all -
main/trunk/package-kits/linux/managers/pacman/conf
r29607 r29638 1 1 BUILD_LIB_DIR: %SYSTEMLIB% 2 2 BUILD_BIN_DIR: %SYSTEMBIN% 3 4 ARCH_NATIVE: 'x86_64' 'i686' 5 ARCH_ANY: 'any' -
main/trunk/package-kits/linux/managers/rpm/conf
r29607 r29638 1 1 BUILD_LIB_DIR: %{_libdir}/* 2 2 BUILD_BIN_DIR: %{_bindir}/* 3 4 ARCH_NATIVE: 5 ARCH_ANY: noarch -
main/trunk/package-kits/linux/perllib/Greenstone/Package/_rpm.pm
r29611 r29638 53 53 my @optional; 54 54 scalar(@{$self->{config}->{DEPENDS}}) gt 0 and 55 push @optional, 'Requires: %DEPENDS%'; 55 push @optional, 'Requires: %DEPENDS%'; 56 # Cannot set architecture for subpackages because RPM's subpackages 57 # implementation is broken. 58 # Greenstone core gets split into three packages: 59 # - The main web servlets (java classes) - noarch 60 # - The native libraries used by the servlets - native 61 # - The tools for building collections - native 62 # As RPM forces subpackages to inherit their name from a root package, 63 # the main web servlets must be set as the root package 64 # (in order for everything to get the right name). 65 # This means that the root package should be noarch, and the subpackages 66 # must be native. 67 # But this is impossible with RPM (subpackages must be either the same 68 # architecture as the root package, or noarch) 69 # To avoid this until someone fixes RPM into an actual working package 70 # manager, we will just make the core greenstone package pretend to 71 # be native. 72 unless (defined $packages) { 73 $self->{config}->{ARCHITECTURE} eq $self->{config}->{ARCH_ANY} and 74 push @optional, 'BuildArch: %ARCHITECTURE%'; 75 } 56 76 for my $line ( 57 77 'Name: %NAME%', … … 95 115 $self->{config} = $package; 96 116 my @optional; 97 scalar(@{$ package->{DEPENDS}}) gt 0 and98 push @optional, 'Requires: %DEPENDS%';117 scalar(@{$self->{config}->{DEPENDS}}) gt 0 and 118 push @optional, 'Requires: %DEPENDS%'; 99 119 for my $line ( 100 120 '%package %NAME%', 101 'Summary: %DESCRIPTION_SHORT%',121 'Summary: %DESCRIPTION_SHORT%', 102 122 'AutoReqProv: no', 103 123 @optional,
Note:
See TracChangeset
for help on using the changeset viewer.