pool/patterns-devel-base
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 625135 from home:simotek:branches:system:install:head

Browse Source 
- Merge with the version from SLE/Leap 15 full changes now below
  in the changelog.
- correctly source the files for 32bit patterns
- obsolete old SLES/SLED development patterns (bsc#1070151)
- Swap web pattern from php5 to php7
- Add 32bit patterns
- Only build certain patterns for openSUSE
- Don't require cvs anymore (not common anymore).
- Recommend git.
- Compact %install routine; replace old RPM shell vars by macros.
- Create new package from old unified patterns package

OBS-URL: https://build.opensuse.org/request/show/625135
OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-devel-base?expand=0&rev=11
This commit is contained in:
Ludwig Nussel 2018-07-30 07:48:19 +00:00 committed by Git OBS Bridge
parent 0a11a545b1
commit f4b65d8ce1
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
create_32bit-patterns_file.pl
View File

@ -73,7 +73,7 @@ sub parse_main_file {
chomp($line); chomp($line);
next if ($line =~ m/^#/); next if ($line =~ m/^#/);
if ($line =~ m/\%package/) { if ($line =~ m/\%package/) {
if(($line =~ m/32bit/) or if(($line =~ m/32bit/) or
($line =~ m/64bit/) ($line =~ m/64bit/)
) { ) {
$skip_it = 1; $skip_it = 1;
@ -81,9 +81,9 @@ sub parse_main_file {
%skip_pat_hash = map { $_ => 1 } @skip_pat; %skip_pat_hash = map { $_ => 1 } @skip_pat;
if($skip_it==0&&!exists($skip_pat_hash{$cur_pattern})) { if($skip_it==0&&!exists($skip_pat_hash{$cur_pattern})) {
$spec_file .= "" $spec_file .= ""
."Provides: pattern() = ${cur_pattern}-32bit\n" ."Provides: pattern() = ${cur_pattern}%2d32bit\n"
."Group: Metapackages\n" ."Group: Metapackages\n"
."Supplements: packageand(patterns-${pat_ext}:patterns-${cur_pattern})\n" ."Supplements: packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
."\n" ."\n"
."%files ${cur_pattern}-32bit\n" ."%files ${cur_pattern}-32bit\n"
."%defattr(-,root,root)\n" ."%defattr(-,root,root)\n"
@ -123,14 +123,14 @@ sub parse_main_file {
$spec_file .= parse_line($line); $spec_file .= parse_line($line);
} }
} }
%skip_pat_hash = map { $_ => 1 } @skip_pat; %skip_pat_hash = map { $_ => 1 } @skip_pat;
if (!exists($skip_pat_hash{$cur_pattern})) { if (!exists($skip_pat_hash{$cur_pattern})) {
# I hate this, but need a fast workaround # I hate this, but need a fast workaround
$spec_file .= "Provides: pattern-invisible()\n" $spec_file .= "Provides: pattern-invisible()\n"
."Provides: pattern() = ${cur_pattern}-${pat_ext}\n" ."Provides: pattern() = ${cur_pattern}%2d${pat_ext}\n"
."Group: Metapackages\n" ."Group: Metapackages\n"
."Supplements: packageand(patterns-${pat_ext}:patterns-${cur_pattern})\n" ."Supplements: packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
."\n" ."\n"
."%files ${cur_pattern}-32bit\n" ."%files ${cur_pattern}-32bit\n"
."%defattr(-,root,root)\n" ."%defattr(-,root,root)\n"
@ -163,11 +163,10 @@ while ($ARGV[0] && $ARGV[0] =~ /^-/) {
} elsif($arg =~ /-s/) { } elsif($arg =~ /-s/) {
push @skip_pat, shift; push @skip_pat, shift;
} }
} }
print_debug("product = ${product}\n pat_ext=${pat_ext}\n", 1); print_debug("product = ${product}\n pat_ext=${pat_ext}\n", 1);
my $result = parse_main_file("patterns-${product}.spec"); my $result = parse_main_file("patterns-${product}.spec");
print "${result}\n"; print "${result}\n";
exit 0; exit 0;

8
pattern-definition-32bit.txt
View File

@ -38,9 +38,9 @@ Recommends: binutils-devel-32bit
Recommends: e2fsprogs-devel-32bit Recommends: e2fsprogs-devel-32bit
Recommends: libapparmor-devel-32bit Recommends: libapparmor-devel-32bit
Recommends: libosip2-devel-32bit Recommends: libosip2-devel-32bit
Provides: pattern() = devel_basis-32bit Provides: pattern() = devel_basis%2d32bit
Group: Metapackages Group: Metapackages
Supplements: packageand(patterns-32bit:patterns-devel_basis) Supplements: packageand(patterns-devel-base-32bit:patterns-devel-base-devel_basis)
%files devel_basis-32bit %files devel_basis-32bit
%defattr(-,root,root) %defattr(-,root,root)
@ -64,9 +64,9 @@ Recommends: quilt-32bit
Recommends: gitk-32bit Recommends: gitk-32bit
Recommends: git-email-32bit Recommends: git-email-32bit
Recommends: kernel-syms-32bit Recommends: kernel-syms-32bit
Provides: pattern() = devel_kernel-32bit Provides: pattern() = devel_kernel%2d32bit
Group: Metapackages Group: Metapackages
Supplements: packageand(patterns-32bit:patterns-devel_kernel) Supplements: packageand(patterns-devel-base-32bit:patterns-devel-base-devel_kernel)
%files devel_kernel-32bit %files devel_kernel-32bit
%defattr(-,root,root) %defattr(-,root,root)

8
patterns-devel-base.changes
View File

@ -1,5 +1,11 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 11 11:25:36 UTC 2017 - simonf.lees@suse.com Thu Jul 19 12:07:25 UTC 2018 - sflees@suse.de
- Merge with the version from SLE/Leap 15 full changes now below
in the changelog.
-------------------------------------------------------------------
Mon Dec 11 11:25:36 UTC 2017 - sflees@suse.de
- correctly source the files for 32bit patterns - correctly source the files for 32bit patterns

1
patterns-devel-base.spec
View File

@ -285,6 +285,7 @@ for i in devel_rpm_build devel_web; do
echo "This file marks the pattern $i to be installed." \ echo "This file marks the pattern $i to be installed." \
>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
done done
%endif %endif
for i in devel_basis devel_kernel; do for i in devel_basis devel_kernel; do

1
pre_checkin.sh
View File

@ -1,4 +1,3 @@
#!/bin/sh #!/bin/sh
./create_32bit-patterns_file.pl -p devel-base -s devel_rpm_build -s devel_web > pattern-definition-32bit.txt ./create_32bit-patterns_file.pl -p devel-base -s devel_rpm_build -s devel_web > pattern-definition-32bit.txt