X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adapter.awk;h=b52d41140b910212040b572c80a249f4291264ab;hb=ca5cfdeafbd72041e7f1b824b692024d0523e5c9;hp=94495e963d1c483a524eef5a80fbae1615c239ff;hpb=202b96a289dcdd888ea7577f6f3bbc4445c1e382;p=packages%2Frpm-build-tools.git diff --git a/adapter.awk b/adapter.awk index 94495e9..b52d411 100644 --- a/adapter.awk +++ b/adapter.awk @@ -2,7 +2,7 @@ # # Adapter adapts .spec files for PLD Linux. # -# Copyright (C) 1999-2007 PLD-Team +# Copyright (C) 1999-2008 PLD-Team # Authors: # Michał Kuratczyk # Sebastian Zagrodzki @@ -24,7 +24,8 @@ # - sort Requires, BuildRequires # - check if %description (lang=C) contains 8bit # - desc wrapping is totally fucked up on global.spec,1.25, dosemu.spec,1.115- -#21:25:40 SamChi> glen: it should change: /%source([0-9]+)/i to %{SOURCE\1} +# - it should change: /%source([0-9]+)/i to %{SOURCE\1} +# - extra quote on LDFLAGS line: https://bugs.launchpad.net/pld-linux/+bug/385836 BEGIN { RPM_SECTIONS = "package|build|changelog|clean|description|install|post|posttrans|postun|pre|prep|pretrans|preun|triggerin|triggerpostun|triggerun|verifyscript|check" @@ -32,7 +33,7 @@ BEGIN { RCSID = "$Id$" rev = RCSID # TODO: parse from RCSID - VERSION = "0.31/" rev + VERSION = "0.35/" rev 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|Auto(Req|Prov))" @@ -750,6 +751,9 @@ preamble == 1 { if (l == "GPLv2+") { l = "GPL v2+" } + if (l == "LGPLv2+") { + l = "LGPL v2+" + } $0 = "License:\t" l; } @@ -1402,6 +1406,11 @@ function use_files_macros( i, n, t, a, l) $0 = "%attr(755,root,root) " $0 } + # remove attrs from man pages + if (/%{_mandir}/ && /^%attr/) { + sub("^%attr\\(.*\\) *", ""); + } + # /etc/sysconfig files # %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/* # attr not required, allow default 644 attr @@ -1571,20 +1580,26 @@ function unify_url(url) { # sourceforge urls - # Docs about sourceforge mirror system: http://sourceforge.net/docs/B05/ - 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) + # Docs about sourceforge mirror system: http://sourceforge.net/apps/trac/sourceforge/wiki/Mirrors + sub("^http://prdownloads\.sourceforge\.net/", "http://downloads.sourceforge.net/", url) + sub("^http://download\.sf\.net/", "http://downloads.sourceforge.net/", url) + sub("^http://download\.sourceforge\.net/", "http://downloads.sourceforge.net/", url) + sub("^http://dl\.sourceforge\.net/", "http://downloads.sourceforge.net/", url) + sub("^http://.*\.dl\.sourceforge\.net/", "http://downloads.sourceforge.net/", url) + sub("^http://dl\.sf\.net/", "http://downloads.sourceforge.net/", url) + sub("^http://downloads\.sourceforge\.net/sourceforge/", "http://downloads.sourceforge.net/", url) + # new style urls, strip "files/" between and prepend dl. + if (match(url, "^http://sourceforge.net/projects/[^/]+/files/")) { + url = substr(url, 1, RLENGTH - length("files/")) substr(url, RSTART + RLENGTH); + sub("^http://sourceforge.net/projects/", "http://downloads.sourceforge.net/project/", url); + } + if (url ~ /sourceforge.net/) { + sub("[?&]big_mirror=.*$", "", url); + sub("[?&]modtime=.*$", "", url); + sub("[?]use_mirror=.*$", "", url); + sub("[?]download$", "", url); + sub("/download$", "", 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) @@ -1697,16 +1712,26 @@ 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(/^log4j$/, "java-log4j", $2); + sub(/^logging-log4j$/, "java-log4j", $2); + sub(/^jakarta-log4j$/, "java-log4j", $2); + sub(/^oro$/, "java-oro", $2); + sub(/^jakarta-oro$/, "java-oro", $2); sub(/^jakarta-ant$/, "ant", $2); - sub(/^xerces-j2$/, "xerces-j", $2); + sub(/^xerces-j2$/, "java-xerces", $2); + sub(/^xerces-j$/, "java-xerces", $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); + sub(/^xalan-j2$/, "java-xalan", $2); + sub(/^xalan-j$/, "java-xalan", $2); + sub(/^gnu-regexp$/, "java-gnu-regexp", $2); + sub(/^gnu.regexp$/, "java-gnu-regexp", $2); + sub(/^jakarta-commons-httpclient$/, "java-commons-httpclient", $2); + sub(/^xml-commons-resolver$/, "java-xml-commons-resolver", $2); + sub(/^axis$/, "java-axis", $2); + sub(/^wsdl4j$/, "java-wsdl4j", $2); + sub(/^uddi4j$/, "java-uddi4j", $2); + sub(/^hamcrest$/, "java-hamcrest", $2); # redhat virtual sub(/^tftp-server$/, "tftpdaemon", $2); @@ -1716,6 +1741,13 @@ function replace_requires() # fedora sub(/^iscsi-initiator-utils$/, "open-iscsi", $2); + sub(/^gnome-python2-extras$/, "python-gnome-extras", $2); + sub(/^gtk2$/, "gtk+2", $2); + sub(/^gtk2-devel$/, "gtk+2-devel", $2); + sub(/^pygtk2-devel$/, "python-pygtk-devel", $2); + sub(/^pygtk2$/, "python-pygtk", $2); + sub(/^qt4-devel$/, "qt4-build", $2); + sub(/^file-devel$/, "libmagic-devel", $2); replace_php_virtual_deps() } @@ -1860,6 +1892,7 @@ function replace_groupnames(group) { group = replace(group, "X11/Utilities", "X11/Applications"); group = replace(group, "X11/XFree86", "X11"); group = replace(group, "X11/Xserver", "X11/Servers"); + group = replace(group, "User Interface/Desktops", "X11/Applications"); return group; }