]> git.pld-linux.org Git - packages/rpm-build-tools.git/blobdiff - adapter.awk
- unify ftp.gnu.org url
[packages/rpm-build-tools.git] / adapter.awk
index 3935b6a0a867c78cc4170ec231ddc8c3cd693b04..f2133e3e51d1cd0469af61b2a24764958865858b 100644 (file)
@@ -1,22 +1,24 @@
-#!/bin/awk -f
+#!/usr/bin/gawk -f
 #
-# This is adapter v0.27. Adapter adapts .spec files for PLD Linux.
+# This is adapter v0.29. Adapter adapts .spec files for PLD Linux.
 # $Id$
 #
-# Copyright (C) 1999-2006 PLD-Team <feedback@pld-linux.org>
+# Copyright (C) 1999-2007 PLD-Team <feedback@pld-linux.org>
 # Authors:
-#      Micha³ Kuratczyk <kura@pld.org.pl>
+#      Michał Kuratczyk <kura@pld.org.pl>
 #      Sebastian Zagrodzki <s.zagrodzki@mimuw.edu.pl>
-#      Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+#      Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
 #      Artur Frysiak <wiget@pld-linux.org>
 #      Michal Kochanowicz <mkochano@pld.org.pl>
-#      Elan Ruusamä¤e <glen@pld-linux.org>
+#      Jakub Bogusz <qboosh@pld-linux.org>
+#      Elan Ruusamäe <glen@pld-linux.org>
 #
 # See cvs log adapter{,.awk} for list of contributors
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 # TODO
+# - really long sourceX make preamble sorting totally fcked up (try snake.spec r1.1)
 # - parse ../PLD-doc/BuildRequires.txt and setup proper BR epoches?
 # - add "-nc" option to skip CVS interaction
 # - sort Summary(XX)
@@ -28,14 +30,17 @@ BEGIN {
        RPM_SECTIONS = "package|build|changelog|clean|description|install|post|posttrans|postun|pre|prep|pretrans|preun|triggerin|triggerpostun|triggerun|verifyscript|check"
        SECTIONS = "^%(" RPM_SECTIONS ")"
 
-       PREAMBLE_TAGS = "(Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires)"
+       PREAMBLE_TAGS = "(R|BR|Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires|Suggests)"
 
-       preamble = 1            # Is it part of preamble? Default - yes
+       usedigest = 0   # Enable to switch to rpm 4.4.6+ md5 digests
+
+       preamble = 1    # Is it part of preamble? Default - yes
        boc = 4                 # Beginning of %changelog
        bod = 0                 # Beginning of %description
        tw = 70                 # Descriptions width
 
        b_idx = 0               # index of BR/R arrays
+       BR_count = 0    # number of additional BuildRequires
 
        # If variable removed, then 1 (for removing it from export)
        removed["LDFLAGS"] = 0
@@ -71,6 +76,7 @@ BEGIN {
        "rpm --eval %_infodir"  | getline infodir
        "rpm --eval %_examplesdir"      | getline examplesdir
        "rpm --eval %_defaultdocdir"    | getline docdir
+       "rpm --eval %_kdedocdir"        | getline kdedocdir
        "rpm --eval %_desktopdir" | getline desktopdir
        "rpm --eval %_pixmapsdir" | getline pixmapsdir
 
@@ -81,10 +87,18 @@ BEGIN {
        "rpm --eval %perl_vendorarch" | getline perl_vendorarch
        "rpm --eval %perl_sitelib" | getline perl_sitelib
 
-       "rpm --eval %py_sitescriptdir" | getline py_sitescriptdir
-       "rpm --eval %py_sitedir" | getline py_sitedir
-       "rpm --eval %py_scriptdir " | getline py_scriptdir
+       "rpm --eval %py_sitescriptdir 2>/dev/null" | getline py_sitescriptdir
+       "rpm --eval %py_sitedir 2>/dev/null" | getline py_sitedir
+       "rpm --eval %py_scriptdir 2>/dev/null" | getline py_scriptdir
+
+       "rpm --eval %ruby_archdir" | getline ruby_archdir
+       "rpm --eval %ruby_ridir" | getline ruby_ridir
+       "rpm --eval %ruby_rubylibdir" | getline ruby_rubylibdir
+       "rpm --eval %ruby_sitearchdir" | getline ruby_sitearchdir
+       "rpm --eval %ruby_sitelibdir" | getline ruby_sitelibdir
+
        "rpm --eval %php_pear_dir" | getline php_pear_dir
+       "rpm --eval %tmpdir" | getline tmpdir
 }
 
 # There should be a comment with CVS keywords on the first line of file.
@@ -112,31 +126,33 @@ defattr == 1 {
 function b_makekey(a, b,       s) {
        s = a "" b;
        # kill bcond
-    gsub(/[#%]+{[!?]+[_a-zA-Z0-9]+:/, "", s);
+       gsub(/[#%]+{[!?]+[_a-zA-Z0-9]+:/, "", s);
 
        # kill commented out items
-    gsub(/^#[ \t]*/, "", s);
+       gsub(/^#[ \t]*/, "", s);
 
        # force order
-    gsub(/^Summary\(/, "11Summary(", s);
-    gsub(/^Summary/, "10Summary", s);
-    gsub(/^Name/, "2Name", s);
-    gsub(/^Version/, "3Version", s);
-    gsub(/^Release/, "4Release", s);
-    gsub(/^Epoch/, "5Epoch", s);
-    gsub(/^License/, "5License", s);
-    gsub(/^Group/, "6Group", s);
-    gsub(/^URL/, "7URL", s);
-
-    gsub(/^BuildRequires/, "B1BuildRequires", s);
-    gsub(/^BuildConflicts/, "B2BuildConflicts", s);
-    gsub(/^Provides/, "X1Provides", s);
-    gsub(/^Obsoletes/, "X2Obsoletes", s);
-    gsub(/^Conflicts/, "X3Conflicts", s);
-    gsub(/^BuildArch/, "X4BuildArch", s);
-    gsub(/^ExclusiveArch/, "X6ExclusiveArch", s);
-    gsub(/^ExcludeArch/, "X7ExcludeArch", s);
-    gsub(/^BuildRoot/, "X9BuildRoot", s);
+       gsub(/^Summary\(/, "11Summary(", s);
+       gsub(/^Summary/, "10Summary", s);
+       gsub(/^Name/, "2Name", s);
+       gsub(/^Version/, "3Version", s);
+       gsub(/^Release/, "4Release", s);
+       gsub(/^Epoch/, "5Epoch", s);
+       gsub(/^License/, "5License", s);
+       gsub(/^Group/, "6Group", s);
+       gsub(/^URL/, "7URL", s);
+
+       gsub(/^BuildRequires/, "B1BuildRequires", s);
+       gsub(/^BuildConflicts/, "B2BuildConflicts", s);
+
+       gsub(/^Suggests/, "X1Suggests", s);
+       gsub(/^Provides/, "X2Provides", s);
+       gsub(/^Obsoletes/, "X3Obsoletes", s);
+       gsub(/^Conflicts/, "X4Conflicts", s);
+       gsub(/^BuildArch/, "X5BuildArch", s);
+       gsub(/^ExclusiveArch/, "X6ExclusiveArch", s);
+       gsub(/^ExcludeArch/, "X7ExcludeArch", s);
+       gsub(/^BuildRoot/, "X9BuildRoot", s);
 
 #      printf("%s -> %s\n", a""b, s);
        return s;
@@ -155,7 +171,11 @@ function b_makekey(a, b,   s) {
        # Generally, comments are printed without touching
        sub(/[ \t]+$/, "")
 
-       if (/Source.*md5/) {
+       if (/#[ \t]*Source.*md5/) {
+               if (usedigest == 1) {
+                       sub(/^#[ \t]*Source/, "BuildRequires:\tdigest(%SOURCE", $0)
+                       sub(/-md5[ \t]*:[ \t]*/, ") = ", $0)
+               }
                print $0
                next
        }
@@ -189,8 +209,14 @@ function b_makekey(a, b,   s) {
                bindir = $3
        if ($2 ~ /_sbindir/)
                sbindir = $3
-       if ($2 ~ /_libdir/)
-               libdir = $3
+       if ($2 ~ /_libdir/) {
+               if ($3 ~ /^%\(/) {
+                       # TODO: should escape for latter checks like: ($c ~ sysconfdir "/{?cron.")
+                       libdir = "%%%%%%%%%%%%%%"
+               } else {
+                       libdir = $3
+               }
+       }
        if ($2 ~ /_sysconfdir/) {
                if ($3 ~ /^%\(/) {
                        # TODO: should escape for latter checks like: ($c ~ sysconfdir "/{?cron.")
@@ -199,8 +225,14 @@ function b_makekey(a, b,   s) {
                        sysconfdir = $3
                }
        }
-       if ($2 ~ /_datadir/)
-               datadir = $3
+       if ($2 ~ /_datadir/) {
+               if ($3 ~ /^%\(/) {
+                       # TODO: should escape for latter checks like: ($c ~ sysconfdir "/{?cron.")
+                       datadir = "%%%%%%%%%%%%%%"
+               } else {
+                       datadir = $3
+               }
+       }
        if ($2 ~ /_includedir/)
                includedir = $3
        if ($2 ~ /_mandir/)
@@ -219,6 +251,8 @@ function b_makekey(a, b,    s) {
                _pre = $3
        if ($2 ~ /^_snap$/)
                _snap = $3
+       if ($2 ~ /^subver$/)
+               subver = $3
 
        # these are used usually when adapterizing external spec
        if ($2 ~ /^name$/)
@@ -255,7 +289,7 @@ function b_makekey(a, b,    s) {
        }
 
        # Format description
-       if (ENVIRON["SKIP_DESC"] != 1 && description == 1 && !$0 ~ SECTIONS && !/^%description/) {
+       if (ENVIRON["SKIP_DESC"] != 1 && description == 1 && !/^%[a-z]+/ && !/^%description/) {
                if (/^[ \t]*$/) {
                        format_flush(format_line, format_indent)
                        print ""
@@ -305,7 +339,7 @@ function b_makekey(a, b,    s) {
                sub(/^%setup/, "%setup -q")
        }
 
-       if (/^%setup/) {
+       if (/^%setup/ && name != "setup") {
                $0 = fixedsub(name, "%{name}", $0);
                $0 = fixedsub(version, "%{version}", $0);
                if (_beta) {
@@ -320,11 +354,15 @@ function b_makekey(a, b,  s) {
                if (_snap) {
                        $0 = fixedsub(_snap, "%{_snap}", $0);
                }
+               if (subver) {
+                       $0 = fixedsub(subver, "%{subver}", $0);
+               }
        }
 
        if (/^%setup/ && /-n %{name}-%{version}( |$)/) {
                $0 = fixedsub(" -n %{name}-%{version}", "", $0)
        }
+       sub("^%patch ", "%patch0 ");
 
        # invalid in %prep
        sub("^rm -rf \$RPM_BUILD_ROOT.*", "");
@@ -343,6 +381,7 @@ function b_makekey(a, b,    s) {
        }
 
        use_macros()
+       use_tabs()
 
        if (/^automake$/)
                sub(/$/, " -a -c")
@@ -394,6 +433,7 @@ function b_makekey(a, b,    s) {
        $0 = fixedsub("automake --add-missing --copy", "%{__automake}", $0);
        $0 = fixedsub("automake -a --foreign --copy", "%{__automake}", $0);
        $0 = fixedsub("automake -a -c --foreign", "%{__automake}", $0);
+       $0 = fixedsub("automake -a -c", "%{__automake}", $0);
        $0 = fixedsub("libtoolize --force --automake --copy", "%{__libtoolize}", $0);
        $0 = fixedsub("libtoolize -c -f --automake", "%{__libtoolize}", $0);
 
@@ -401,6 +441,7 @@ function b_makekey(a, b,    s) {
        sub(/^autoheader$/, "%{__autoheader}");
        sub(/^autoconf$/, "%{__autoconf}");
        sub(/^automake$/, "%{__automake}");
+       sub(/^libtoolize$/, "%{__libtoolize}");
 
        # atrpms
        $0 = fixedsub("%perl_configure", "%{__perl} Makefile.PL \\\n\tINSTALLDIRS=vendor", $0);
@@ -413,10 +454,7 @@ function b_makekey(a, b,   s) {
 /^%clean/, (!/^%clean/ && $0 ~ SECTIONS) {
        did_clean = 1
 
-       # prevent next section header like "%post -p /sbin/ldconfig" being adapterized
-       if (!/^%/) {
-               use_macros()
-       }
+       use_macros()
 }
 
 ############
@@ -426,7 +464,12 @@ function b_makekey(a, b,   s) {
 
        preamble = 0
 
-       if (/^[ \t]*rm([ \t]+-[rf]+)*[ \t]+\${?RPM_BUILD_ROOT}?/ && did_rmroot==0) {
+       # foreign rpms
+       sub("^%{__rm} -rf %{buildroot}", "rm -rf $RPM_BUILD_ROOT")
+       sub("%buildroot", "$RPM_BUILD_ROOT");
+       sub("%{buildroot}", "$RPM_BUILD_ROOT");
+
+       if (/^[ \t]*rm([ \t]+-[rf]+)*[ \t]+(\${?RPM_BUILD_ROOT}?|%{?buildroot}?)/ && did_rmroot==0) {
                did_rmroot=1
                print "rm -rf $RPM_BUILD_ROOT"
                next
@@ -437,15 +480,23 @@ function b_makekey(a, b,  s) {
                did_rmroot=1
        }
 
+       if (tmpdir) {
+               buildroot = tmpdir "/" name "-" version "-root-" ENVIRON["USER"]
+               gsub(buildroot, "$RPM_BUILD_ROOT")
+       }
+
+       if (!/%{_lib}/) {
+               sub("\$RPM_BUILD_ROOT/%", "$RPM_BUILD_ROOT%")
+       }
+
        use_macros()
 
        # 'install -d' instead 'mkdir -p'
        if (/mkdir -p/)
                sub(/mkdir -p/, "install -d")
 
-       # 'install' instead 'cp -p'
-       if (/cp -p\b/)
-               sub(/cp -p/, "install")
+       # cp -a already implies cp -r
+       sub(/^cp -ar/, "cp -a")
 
        # No '-u root' or '-g root' for 'install'
        if (/^install/ && /-[ug][ \t]*root/)
@@ -462,10 +513,6 @@ function b_makekey(a, b,   s) {
        if ($1 ~ /chmod/ && $2 ~ /644/)
                next
 
-       # foreign rpms
-       $0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
-       $0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
-
        # atrpms
        $0 = fixedsub("%perl_makeinstall", "%{__make} pure_install \\\n\tDESTDIR=$RPM_BUILD_ROOT", $0);
 }
@@ -492,24 +539,27 @@ function b_makekey(a, b,  s) {
        skip = 0
        # There should be some CVS keywords on the first line of %changelog.
        if (boc == 3) {
-               if ($0 !~ _cvsmailfeedback)
+               if ($0 !~ _cvsmailfeedback) {
                        print "* %{date} " _cvsmailfeedback > changelog_file
-               else
+               } else {
                        skip = 1
+               }
                boc = 2
        }
        if (boc == 2 && !skip) {
                if (!/All persons listed below/) {
                        printf "All persons listed below can be reached at " > changelog_file
                        print "<cvs_login>" _cvsmaildomain "\n" > changelog_file
-               } else
+               } else {
                        skip = 1
+               }
                boc = 1
        }
        if (boc == 1 && !skip) {
                if (!/^$/) {
-                       if (!/\$.*Log:.*\$/)
+                       if (!/\$.*Log:.*\$/) {
                                print "$" "Log:$" > changelog_file
+                       }
                        boc = 0
                }
        }
@@ -523,11 +573,19 @@ function b_makekey(a, b,  s) {
                boc = 3
        }
 
-       sub(/[ \t]+$/, "")
-       if (!/^%[a-z]+$/ || /changelog/)
+       sub(/[ \t]+$/, "");
+       if (!/^%[a-z]+$/ || /changelog/) {
+               # stop changelog if "real" changelog starts
+               if (boc == 0 && /^\* /) {
+                       boc = -1
+               }
+               if (boc == -1) {
+                       next;
+               }
                print > changelog_file
-       else
+       } else {
                print
+       }
        next
 }
 
@@ -537,12 +595,18 @@ function b_makekey(a, b,  s) {
 /^%pre/, (!/^%pre/ && $0 ~ SECTIONS) {
        preamble = 0
 
+       if (gsub("/usr/sbin/useradd", "%useradd")) {
+               sub(" 2> /dev/null \|\| :", "");
+               sub(" >/dev/null 2>&1 \|\|:", "");
+       }
+
        # %useradd and %groupadd may not be wrapped
        if (/%(useradd|groupadd).*\\$/) {
                a = $0; getline;
                sub(/^[\s\t]*/, "");
                $0 = substr(a, 1, length(a) - 1) $0;
        }
+       use_script_macros()
 }
 
 /^%post/, (!/^%post/ && $0 ~ SECTIONS) {
@@ -551,30 +615,39 @@ function b_makekey(a, b,  s) {
 }
 /^%preun/, (!/^%preun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_macros()
 }
 /^%postun/, (!/^%postun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%triggerin/, (!/^%triggerin/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%triggerun/, (!/^%triggerun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%triggerpostun/, (!/^%triggerpostun/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%pretrans/, (!/^%pretrans/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%posttrans/, (!/^%posttrans/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%verifyscript/, (!/^%verifyscript/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 /^%check/, (!/^%check/ && $0 ~ SECTIONS) {
        preamble = 0
+       use_script_macros()
 }
 
 #############
@@ -593,7 +666,7 @@ preamble == 1 {
 
        field = tolower($1)
        fieldnlower = $1
-       if (field ~ /summary:/ && !/etc\.$/) {
+       if (field ~ /summary:/ && !/etc\.$/ && !/Inc\.$/) {
                sub(/\.$/, "", $0);
        }
        if (field ~ /group(\([^)]+\)):/)
@@ -603,28 +676,48 @@ preamble == 1 {
                group = $0;
                sub(/^[^ \t]*[ \t]*/, "", group);
 
-               sub(/^Utilities\//,"Applications/", group)
-               sub(/^Games/,"Applications/Games", group)
-               sub(/^X11\/Games/,"X11/Applications/Games", group)
-               sub(/^X11\/GNOME\/Development\/Libraries/,"X11/Development/Libraries", group)
-               sub(/^X11\/GNOME\/Applications/,"X11/Applications", group)
-               sub(/^X11\/GNOME/,"X11/Applications", group)
-               sub(/^X11\/Utilities/,"X11/Applications", group)
-               sub(/^X11\/Games\/Strategy/,"X11/Applications/Games/Strategy", group)
-               sub(/^Shells/,"Applications/Shells", group)
-               sub(/^System Environment\/Libraries$/, "Libraries", group)
-               sub(/^System Environment\/Daemons$/, "Daemons", group)
-               sub(/^Applications\/Internet$/, "Applications/Networking", group)
-               sub(/^Applications\/Daemons$/, "Daemons", group)
+               sub(/^Amusements\/Games\/Strategy\/Real Time/, "X11/Applications/Games/Strategy", group)
                sub(/^Application\/Multimedia$/, "Applications/Multimedia", group)
-               sub(/^System\/Servers$/, "Daemons", group)
-               sub(/^X11\/Xserver$/, "X11/Servers", group)
-               sub(/^X11\/XFree86/, "X11", group)
                sub(/^Applications\/Compilers$/, "Development/Languages", group)
+               sub(/^Applications\/Daemons$/, "Daemons", group)
+               sub(/^Applications\/Internet$/, "Applications/Networking", group)
                sub(/^Applications\/Internet\/Peer to Peer/, "Applications/Networking", group)
-               sub(/^Networking\/Deamons$/, "Networking/Daemons", group)
+               sub(/^Applications\/Productivity$/, "X11/Applications", group)
+               sub(/^Database$/, "Applications/Databases", group)
+               sub(/^Development\/Code Generators$/, "Development", group)
                sub(/^Development\/Docs$/, "Documentation", group)
+               sub(/^Development\/Documentation$/, "Documentation", group)
+               sub(/^Development\/Java/, "Development/Languages/Java", group)
+               sub(/^Development\/Libraries\/C and C\+\+$/, "Development/Libraries", group)
+               sub(/^Development\/Libraries\/Java$/, "Development/Languages/Java", group)
+               sub(/^Development\/Other/,"Development", group)
+               sub(/^Development\/Testing$/, "Development", group)
+               sub(/^Emulators$/, "Applications/Emulators", group)
+               sub(/^Games/,"Applications/Games", group)
+               sub(/^Library\/Development$/, "Development/Libraries", group)
+               sub(/^Networking\/Deamons$/, "Networking/Daemons", group)
+               sub(/^Shells/,"Applications/Shells", group)
+               sub(/^System Environment\/Base$/, "Base", group)
+               sub(/^System Environment\/Daemons$/, "Daemons", group)
                sub(/^System Environment\/Kernel$/, "Base/Kernel", group)
+               sub(/^System Environment\/Libraries$/, "Libraries", group)
+               sub(/^System$/, "Base", group)
+               sub(/^System\/Base$/, "Base", group)
+               sub(/^System\/Libraries$/, "Libraries", group)
+               sub(/^System\/Servers$/, "Daemons", group)
+               sub(/^Text Processing\/Markup\/HTML$/, "Applications/Text", group)
+               sub(/^Text Processing\/Markup\/XML$/, "Applications/Text", group)
+               sub(/^Utilities\//,"Applications/", group)
+               sub(/^Web\/Database$/, "Applications/WWW", group)
+               sub(/^X11\/GNOME/,"X11/Applications", group)
+               sub(/^X11\/GNOME\/Applications/,"X11/Applications", group)
+               sub(/^X11\/GNOME\/Development\/Libraries/,"X11/Development/Libraries", group)
+               sub(/^X11\/Games/,"X11/Applications/Games", group)
+               sub(/^X11\/Games\/Strategy/,"X11/Applications/Games/Strategy", group)
+               sub(/^X11\/Library/,"X11/Libraries", group)
+               sub(/^X11\/Utilities/,"X11/Applications", group)
+               sub(/^X11\/XFree86/, "X11", group)
+               sub(/^X11\/Xserver$/, "X11/Servers", group)
 
                $0 = "Group:\t\t" group
 
@@ -651,15 +744,46 @@ preamble == 1 {
        }
 
        if (field ~ /prereq:/) {
-               sub(/PreReq:/, "Requires:", $1);
+               sub(/Pre[Rr]eq:/, "Requires:", $1);
        }
 
        # split (build)requires, obsoletes on commas
-       if (field ~ /(obsoletes|requires|conflicts):/ && NF > 2) {
+       if (field ~ /(obsoletes|requires|provides|conflicts):/ && NF > 2) {
                value = substr($0, index($0, $2));
                $0 = format_requires($1, value);
        }
 
+       # BR: tar (and others) is to common (rpm-build requires it)
+       if (field ~ /^buildrequires:/) {
+               l = substr($0, index($0, $2));
+               if (l == "awk" ||
+                       l == "binutils" ||
+                       l == "bzip2" ||
+                       l == "cpio" ||
+                       l == "diffutils" ||
+                       l == "elfutils" ||
+                       l == "fileutils" ||
+                       l == "findutils" ||
+                       l == "glibc-devel" ||
+                       l == "grep" ||
+                       l == "gzip" ||
+                       l == "make" ||
+                       l == "patch" ||
+                       l == "sed" ||
+                       l == "sh-utils" ||
+                       l == "tar" ||
+                       l == "textutils") {
+                       next
+               }
+
+               replace_requires();
+       }
+
+       if (field ~ /^requires:/) {
+               replace_requires();
+       }
+
+
        # obsolete/unwanted tags
        if (field ~ /vendor:|packager:|distribution:|docdir:|prefix:|icon:|author:|author-email:|metadata-version:/) {
                next
@@ -680,6 +804,18 @@ preamble == 1 {
                if (l == "Python Software Foundation License") {
                        l = "PSF"
                }
+               if (l == "Apache License 2.0" || l == "Apache 2.0" || l == "Apache License Version 2.0" || l == "Apache License, Version 2.0" || l == "Apache Software License v2") {
+                       l = "Apache v2.0"
+               }
+               if (l == "Apache Group License" || l == "Apache Software License" || l == "Apache License") {
+                       l = "Apache"
+               }
+               if (l == "Apache-style License" || l == "Apache-style Software License") {
+                       l = "Apache-like"
+               }
+               if (l == "Apache Software License 1.1" || l == "Apache 1.1") {
+                       l = "Apache v1.1"
+               }
                $0 = "License:\t" l;
        }
 
@@ -787,18 +923,14 @@ preamble == 1 {
                        if (_snap) {
                                url[n] = fixedsub(_snap, "%{_snap}", url[n])
                        }
+                       if (subver) {
+                               url[n] = fixedsub(subver, "%{subver}", url[n])
+                       }
                }
                # assigning to $2 kills preamble formatting
                $2 = fixedsub(filename, url[n], $2)
 
-               # sourceforge urls
-               sub("[?]use_mirror=.*$", "", $2);
-               sub("[?]download$", "", $2);
-               sub("^http://prdownloads\.sourceforge\.net/", "http://dl.sourceforge.net/", $2)
-
-               sub("^http://.*\.dl\.sourceforge\.net/", "http://dl.sourceforge.net/", $2)
-               sub("^http://dl\.sourceforge\.net/sourceforge/", "http://dl.sourceforge.net/", $2)
-               sub("^http://dl\.sf\.net/", "http://dl.sourceforge.net/", $2)
+               $2 = unify_url($2)
        }
 
 
@@ -817,17 +949,28 @@ preamble == 1 {
        }
 }
 
+/^%bcond_/ {
+       # do nothing
+       print
+       next
+}
 
 # sort BR/R!
 #
 # NOTES:
 # - mixing BR/R and anything else confuses this (all will be sorted together)
-#   so don't do that.
+#      so don't do that.
 # - comments leading the BR/R can not be associated,
-#   so don't adapterize when the BR/R are mixed with comments
+#      so don't adapterize when the BR/R are mixed with comments
 ENVIRON["SKIP_SORTBR"] != 1 && preamble == 1 && $0 ~ PREAMBLE_TAGS, $0 ~ PREAMBLE_TAGS {
        if ($1 ~ /Pre[Rr]eq:/) {
-               sub(/PreReq:/, "Requires:", $1);
+               sub(/Pre[Rr]eq:/, "Requires:", $1);
+       }
+       if ($1 == "BR:" ) {
+               $1 = "BuildRequires:"
+       }
+       if ($1 == "R:" ) {
+               $1 = "Requires:"
        }
        format_preamble()
 #      kill_preamble_macros(); # breaks tabbing
@@ -841,12 +984,6 @@ ENVIRON["SKIP_SORTBR"] != 1 && preamble == 1 && $0 ~ PREAMBLE_TAGS, $0 ~ PREAMBL
        next;
 }
 
-/^%bcond_/ {
-       # do nothing
-       print
-       next
-}
-
 preamble == 1 {
        if (b_idx > 0) {
                isort(b_key, b_idx);
@@ -867,7 +1004,7 @@ preamble == 1 {
        print
 
        if (name_seen == 0 && name) {
-               print "Name:\t" name
+               print "Name:\t\t" name
                name_seen = 1
        }
 
@@ -896,6 +1033,13 @@ END {
        if (do_not_touch_anything)
                exit 0
 
+       # TODO: need to output these in proper place
+       if (BR_count > 0) {
+               for (i = 0; i <= BR_count; i++) {
+                       print BR[i];
+               }
+       }
+
        close(changelog_file)
        while ((getline < changelog_file) > 0)
                print
@@ -912,17 +1056,20 @@ END {
                print "%define date\t%(echo `LC_ALL=\"C\" date +\"%a %b %d %Y\"`)"
        }
 
-       if (has_changelog == 0)
+       if (has_changelog == 0) {
                print "%changelog"
+       }
 
-       if (boc > 2)
+       if (boc > 2) {
                print "* %{date} PLD Team <feedback@pld-linux.org>"
+       }
        if (boc > 1) {
                printf "All persons listed below can be reached at "
                print "<cvs_login>@pld-linux.org\n"
        }
-       if (boc > 0)
+       if (boc > 0) {
                print "$" "Log:$"
+       }
 }
 
 function fixedsub(s1,s2,t, ind) {
@@ -939,11 +1086,12 @@ function format_preamble()
                return;
        }
        sub(/:[ \t]*/, ":")
-       if (match($0, /[A-Za-z0-9(),#_ \t]+[ \t]*:[ \t]*/) == 1) {
-               if (RLENGTH < 8)
+       if (match($0, /[A-Za-z0-9(),#_ \t.-]+[ \t]*:[ \t]*/) == 1) {
+               if (RLENGTH < 8) {
                        sub(/:/, ":\t\t")
-               else
+               } else {
                        sub(/:/, ":\t")
+               }
        }
 }
 
@@ -960,6 +1108,12 @@ function use_macros()
                return;
        }
 
+       sub("%{_defaultdocdir}", "%{_docdir}");
+       sub("%{_bindir}/perl", "%{__perl}");
+       sub("%{_bindir}/python", "%{__python}");
+
+       gsub(infodir, "%{_infodir}")
+
        gsub(perl_sitearch, "%{perl_sitearch}")
        gsub(perl_archlib, "%{perl_archlib}")
        gsub(perl_privlib, "%{perl_privlib}")
@@ -971,9 +1125,19 @@ function use_macros()
        gsub(py_sitedir, "%{py_sitedir}")
        gsub(py_scriptdir, "%{py_scriptdir}")
        gsub("%{_libdir}/python2.4/site-packages", "%{py_sitedir}")
+       gsub("%{python_sitelib}", "%{py_sitedir}")
+
+       gsub(ruby_archdir, "%{ruby_archdir}")
+       gsub(ruby_ridir, "%{ruby_ridir}")
+       gsub(ruby_rubylibdir, "%{ruby_rubylibdir}")
+       gsub(ruby_sitearchdir, "%{ruby_sitearchdir}")
+       gsub(ruby_sitelibdir, "%{ruby_sitelibdir}")
+
        gsub("%{_datadir}/applications", "%{_desktopdir}")
        gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
 
+       gsub(libdir, "%{_libdir}")
+
        gsub(bindir, "%{_bindir}")
        gsub("%{prefix}/bin", "%{_bindir}")
        if (prefix"/bin" == bindir)
@@ -984,18 +1148,23 @@ function use_macros()
                        continue;
                if ($c ~ sbindir "/webapp")
                        continue;
+               if ($c ~ sbindir "/ldconfig")
+                       continue;
                if ($c ~ sbindir "/chsh")
                        continue;
                if ($c ~ sbindir "/usermod")
                        continue;
                if ($c ~ sbindir "/chkconfig")
                        continue;
+               if ($c ~ sbindir "/installzope(product|3package)")
+                       continue;
                gsub(sbindir, "%{_sbindir}", $c)
        }
 
        gsub("%{prefix}/sbin", "%{_sbindir}")
-       if (prefix"/sbin" == sbindir)
+       if (prefix"/sbin" == sbindir) {
                gsub("%{_prefix}/sbin", "%{_sbindir}")
+       }
 
        for (c = 1; c <= NF; c++) {
                if ($c ~ sysconfdir "/{?cron.")
@@ -1004,6 +1173,10 @@ function use_macros()
                        continue;
                if ($c ~ sysconfdir "/{?env.d")
                        continue;
+               if ($c ~ sysconfdir "/{?modprobe.(d|conf)")
+                       continue;
+               if ($c ~ sysconfdir "/{?udev/rules.d")
+                       continue;
                if ($c ~ sysconfdir "/{?logrotate.d")
                        continue;
                if ($c ~ sysconfdir "/{?pam.d")
@@ -1032,9 +1205,16 @@ function use_macros()
                        continue;
                if ($c ~ sysconfdir "/{?samba")
                        continue;
+               if ($c ~ sysconfdir "/shells")
+                       continue;
+               if ($c ~ sysconfdir "/ppp")
+                       continue;
+               if ($c ~ sysconfdir "/dbus-1")
+                       continue;
                gsub(sysconfdir, "%{_sysconfdir}", $c)
        }
 
+       gsub(kdedocdir, "%{_kdedocdir}")
        gsub(docdir, "%{_docdir}")
        gsub(php_pear_dir, "%{php_pear_dir}")
 
@@ -1093,6 +1273,8 @@ function use_macros()
                                        continue;
                                if ($c ~ prefix "/sbin/usermod")
                                        continue;
+                               if ($c ~ prefix "/sbin/installzope(product|3package)")
+                                       continue;
                                if ($c ~ prefix "/share/automake")
                                        continue;
                                if ($c ~ prefix "/share/unsermake")
@@ -1125,6 +1307,7 @@ function use_macros()
        gsub("^make$", "%{__make}")
        gsub("^make ", "%{__make} ")
        gsub("^gcc ", "%{__cc} ")
+       gsub("^rm --interactive=never ", "%{__rm} ")
 
        # mandrake specs
        gsub("^%make$", "%{__make}")
@@ -1134,15 +1317,15 @@ function use_macros()
        gsub("^%makeinstall", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
        gsub("^%{__rm} -rf %{buildroot}", "rm -rf $RPM_BUILD_ROOT")
        gsub("^%{__install}", "install")
-       gsub("^%{__rm}", "rm")
        gsub("%optflags", "%{rpmcflags}")
        gsub("%{compat_perl_vendorarch}", "%{perl_vendorarch}")
 
        gsub("^%{__make} install DESTDIR=\$RPM_BUILD_ROOT", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
-       gsub("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\&1")
+       gsub("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\\&1")
        $0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
        $0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
        $0 = fixedsub("CXXFLAGS=%{rpmcflags} %configure", "CXXFLAGS=%{rpmcflags}\n%configure", $0);
+       $0 = fixedsub("%__install", "install", $0);
 
        # split configure line to multiple lines
        if (/%configure / && !/\\$/) {
@@ -1155,9 +1338,23 @@ function use_macros()
        gsub("%_sbindir", "%{_sbindir}")
        gsub("%_mandir", "%{_mandir}")
        gsub("%name", "%{name}")
+       gsub(/%__rm/, "rm");
+       gsub(/%__mkdir_p/, "install -d");
+       gsub(/%__cp/, "cp");
+       gsub(/%__ln_s/, "ln -s");
+       gsub(/%__sed/, "%{__sed}");
+       gsub(/%__cat/, "cat");
+       gsub(/%__chmod/, "chmod");
 
        gsub("/usr/src/linux", "%{_kernelsrcdir}")
        gsub("%{_prefix}/src/linux", "%{_kernelsrcdir}")
+
+       if (/^ant /) {
+               sub(/^ant/, "%ant")
+               add_br("BuildRequires:  jpackage-utils");
+               add_br("BuildRequires:  rpmbuild(macros) >= 1.300");
+       }
+
 }
 
 function format_configure(line,                n, a, s) {
@@ -1193,6 +1390,8 @@ function use_files_macros(        i, n, t, a)
                return;
        }
 
+       sub("^%doc %{_mandir}", "%{_mandir}")
+
        gsub("^%{_sbindir}", "%attr(755,root,root) %{_sbindir}")
        gsub("^%{_bindir}", "%attr(755,root,root) %{_bindir}")
 
@@ -1218,6 +1417,7 @@ function use_files_macros(        i, n, t, a)
        gsub("%{_sysconfdir}/sysconfig", "/etc/sysconfig")
        gsub("%{_sysconfdir}/certs", "/etc/certs")
        gsub("%{_sysconfdir}/init.d", "/etc/init.d")
+       gsub("%{_sysconfdir}/dbus-1", "/etc/dbus-1")
 
        # /etc/init.d -> /etc/rc.d/init.d
        if (!/^\/etc\/init\.d$/) {
@@ -1245,11 +1445,11 @@ function use_files_macros(      i, n, t, a)
        # %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
        # attr not required, allow default 644 attr
        if (!/network-scripts/ && !/%dir/ && !/\.d$/ && !/functions/ && !/\/etc\/sysconfig\/wmstyle/) {
-               if (/\/etc\/sysconfig\// && /%config/ && !/%config\(noreplace\)/) {
+               if (/\/etc\/sysconfig\// && /%config/ && !/%config\(noreplace/) {
                        gsub("%config", "%config(noreplace)")
                }
 
-               if (/\/etc\/sysconfig\// && !/%config\(noreplace\)/) {
+               if (/\/etc\/sysconfig\// && !/%config\(noreplace/) {
                        $NF = "%config(noreplace) " $NF
                }
 
@@ -1267,6 +1467,16 @@ function use_files_macros(       i, n, t, a)
                gsub("%attr\\(0", "%attr(")
        }
 
+       # kill leading whitespace
+       gsub(/^ +/, "");
+
+       # kill default attrs
+       gsub(/%dir %attr\(755,root,root\)/, "%dir");
+       gsub(/%attr\(755,root,root\) %dir/, "%dir");
+       if (!/%dir/) {
+               gsub(/%attr\(644,root,root\) /, "");
+       }
+
        # sort %verify attrs
        if (match($0, /%verify\(not([^)]+)\)/)) {
                t = substr($0, RSTART, RLENGTH)
@@ -1309,6 +1519,14 @@ function use_files_macros(       i, n, t, a)
        gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}");
 }
 
+function use_script_macros()
+{
+       if (gsub("/sbin/service", "%service")) {
+               sub(" >/dev/null 2>&1 \|\|:", "");
+               sub(" 2> /dev/null \|\| :", "");
+       }
+}
+
 function fill(ch, n, i) {
        for (i = 0; i < n; i++)
                printf("%c", ch)
@@ -1358,6 +1576,36 @@ function cflags(var)
        return 1
 }
 
+function unify_url(url)
+{
+
+       # sourceforge urls
+       sub("[?&]big_mirror=.*$", "", url);
+       sub("[?&]modtime=.*$", "", url);
+       sub("[?]use_mirror=.*$", "", url);
+       sub("[?]download$", "", url);
+
+       sub("^http://prdownloads\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
+       sub("^http://download\.sf\.net/", "http://dl.sourceforge.net/", url)
+       sub("^http://download\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
+       sub("^http://downloads\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
+
+       sub("^http://.*\.dl\.sourceforge\.net/", "http://dl.sourceforge.net/", url)
+       sub("^http://dl\.sourceforge\.net/sourceforge/", "http://dl.sourceforge.net/", url)
+       sub("^http://dl\.sf\.net/", "http://dl.sourceforge.net/", url)
+
+       sub("^ftp://ftp\.gnome\.org/", "http://ftp.gnome.org/", url)
+       sub("^http://ftp\.gnome\.org/pub/gnome/", "http://ftp.gnome.org/pub/GNOME/", url)
+
+       # apache urls
+       sub("^http://apache.zone-h.org/", "http://www.apache.org/dist/", url)
+
+       # gnu.org
+       sub("^ftp://ftp.gnu.org/gnu/", "http://ftp.gnu.org/gnu/", url)
+
+       return url
+}
+
 function demacroize(str)
 {
        if (mod_name) {
@@ -1381,16 +1629,22 @@ function demacroize(str)
        if (_snap) {
                sub("%{_snap}", _snap, str);
        }
+       if (subver) {
+               sub("%{subver}", subver, str);
+       }
        return str;
 }
 
 function kill_preamble_macros()
 {
-       if ($1 ~ /^URL:/ || $1 ~ /^Obsoletes:/) {
+       if ($1 ~ /^Obsoletes:/) {
+               # NB! assigning $2 a value breaks tabbing
+               $2 = demacroize($2);
+       }
+       if ($1 ~ /^URL:/) {
                # NB! assigning $2 a value breaks tabbing
                $2 = demacroize($2);
-               # unify sourceforge url
-               sub("\.sf\.net/$", ".sourceforge.net/", $2);
+               $2 = unify_url($2)
        }
 }
 
@@ -1433,3 +1687,71 @@ function format_requires(tag, value,     n, p, i, deps, ndeps) {
        }
        return substr(s, 1, length(s)-1);
 }
+
+function use_tabs()
+{
+       # reverse vim: ts=4 sw=4 et
+       gsub(/    /, "\t");
+}
+
+function add_br(br)
+{
+       BR[BR_count++] = br
+}
+
+function replace_requires()
+{
+
+       # jpackages
+       sub(/^java-devel$/, "jdk", $2);
+       sub(/^log4j$/, "logging-log4j", $2);
+       sub(/^jakarta-log4j$/, "logging-log4j", $2);
+       sub(/^oro$/, "jakarta-oro", $2);
+       sub(/^jakarta-ant$/, "ant", $2);
+       sub(/^xerces-j2$/, "xerces-j", $2);
+       sub(/^ldapjdk$/, "ldapsdk", $2);
+       sub(/^saxon-scripts$/, "saxon", $2);
+       sub(/^xalan-j2$/, "xalan-j", $2);
+       sub(/^xerces-j2$/, "xerces-j", $2);
+       sub(/^gnu-regexp$/, "gnu.regexp", $2);
+
+       # redhat virtual
+       sub(/^tftp-server$/, "tftpdaemon", $2);
+
+       sub(/^gcc-c\+\+$/, "libstdc++-devel", $2);
+       sub(/^chkconfig$/, "/sbin/chkconfig", $2);
+
+       replace_php_virtual_deps()
+}
+
+# php virtual deps as discussed in devel-en
+function replace_php_virtual_deps()
+{
+       pkg = $2
+#      if (pkg == "php-program") {
+#              $0 = $1 "\t/usr/bin/php"
+#              return
+#      }
+
+#      if (pkg ~ /^php-[a-z]/ && pkg !~ /^php-(pear|common|cli|devel|fcgi|cgi|dirs|program|pecl-)/) {
+#              sub(/^php-/, "php(", pkg);
+#              sub(/$/, ") # verify this correctness -- it may be wanted to use specific not virtual dep", pkg);
+#              $2 = pkg
+#      }
+
+       if (pkg ~/^php$/) {
+               $2 = "webserver(php)";
+               if ($4 ~ /^[0-9]:/) {
+                       $4 = substr($4, 3);
+               }
+       }
+
+       if (pkg ~/^php4$/) {
+               $2 = "webserver(php)";
+               if ($4 ~ /^[0-9]:/) {
+                       $4 = substr($4, 3);
+               }
+       }
+}
+
+# vim:ts=4:sw=4
This page took 0.07544 seconds and 4 git commands to generate.