Changeset 29638 for main/trunk/package-kits/linux/perllib/Greenstone/Package/_rpm.pm

Timestamp:

2014-12-15T15:56:33+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Building for correct architecture for RPM. Kind of. Subpackage architectures don't work due to a flaw in RPM subpackages (see rant in perllib/Greenstone/Package/_rpm.pm for details)

File:

• main/trunk/package-kits/linux/perllib/Greenstone/Package/_rpm.pm (modified) (2 diffs)

main/trunk/package-kits/linux/perllib/Greenstone/Package/_rpm.pm

@@ -53 +53 @@
         my @optional;
         scalar(@{$self->{config}->{DEPENDS}}) gt 0 and
-            push @optional, 'Requires:  %DEPENDS%';
+            push @optional, 'Requires:      %DEPENDS%';
+        # Cannot set architecture for subpackages because RPM's subpackages
+        #  implementation is broken.
+        # Greenstone core gets split into three packages:
+        #  - The main web servlets (java classes)       - noarch
+        #  - The native libraries used by the servlets  - native
+        #  - The tools for building collections         - native
+        # As RPM forces subpackages to inherit their name from a root package,
+        #  the main web servlets must be set as the root package
+        #  (in order for everything to get the right name).
+        # This means that the root package should be noarch, and the subpackages
+        #  must be native.
+        # But this is impossible with RPM (subpackages must be either the same
+        #  architecture as the root package, or noarch)
+        # To avoid this until someone fixes RPM into an actual working package
+        #  manager, we will just make the core greenstone package pretend to
+        #  be native.
+        unless (defined $packages) {
+            $self->{config}->{ARCHITECTURE} eq $self->{config}->{ARCH_ANY} and
+                push @optional, 'BuildArch:     %ARCHITECTURE%';
+        }
         for my $line (
             'Name:          %NAME%',
@@ -95 +115 @@
             $self->{config} = $package;
             my @optional;
-            scalar(@{$package->{DEPENDS}}) gt 0 and
-                push @optional, 'Requires:  %DEPENDS%';
+            scalar(@{$self->{config}->{DEPENDS}}) gt 0 and
+                push @optional, 'Requires:      %DEPENDS%';
             for my $line (
                 '%package %NAME%',
-                'Summary:   %DESCRIPTION_SHORT%',
+                'Summary:       %DESCRIPTION_SHORT%',
                 'AutoReqProv:   no',
                 @optional,