X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adapter.awk;h=7682f26d55aea1f83982a2596ab663a0782c9077;hb=15e34b635b27a3f5ebb391035ac759015cad5d73;hp=f106f06f9369cf4a792bfb95d24938965079f2ee;hpb=c6ddd554206241d8dff13e3e5ea2448a2ea17141;p=packages%2Frpm-build-tools.git diff --git a/adapter.awk b/adapter.awk index f106f06..7682f26 100644 --- a/adapter.awk +++ b/adapter.awk @@ -2,7 +2,7 @@ # # Adapter adapts .spec files for PLD Linux. # -# Copyright (C) 1999-2010 PLD-Team +# Copyright (C) 1999-2011 PLD-Team # Authors: # Michał Kuratczyk # Sebastian Zagrodzki @@ -66,14 +66,16 @@ BEGIN { system("[ -d ../PLD-doc ] && cd ../PLD-doc && ([ -f BuildRequires.txt ] || cvs up BuildRequires.txt >/dev/null)"); # Temporary file for changelog section - changelog_file = ENVIRON["HOME"] "/tmp/adapter.changelog" + changelog_file = mktemp("adapter.changelogXXXXXX") } # There should be a comment with CVS keywords on the first line of file. FNR == 1 { - if (!/# \$Revision:/) # If this line is already OK? + if (!/^# \$[R]evision: .* \$, \$[D]ate: .* \$$/) { # If this line is already OK? print "# $" "Revision:$, " "$" "Date:$" # No - else { + if ( /^#.*([rR]evision|[dD]ate)/ ) # There was something similar, but incorrect + next + } else { print $0 # Yes next # It is enough for first line } @@ -91,6 +93,12 @@ defattr == 1 { defattr = 0 } +# call mktemp(1) and return the value +function mktemp(template, tmp) { + "mktemp " template | getline tmp + return tmp +} + function b_makekey(a, b, s) { s = a "" b; # kill bcond @@ -352,6 +360,11 @@ function b_makekey(a, b, s) { } sub("^%patch ", "%patch0 "); + # fedora extras + if (/^%apply/) { + sub("^%apply -n", "%patch"); + } + # invalid in %prep sub("^rm -rf \$RPM_BUILD_ROOT.*", ""); } @@ -596,6 +609,19 @@ function b_makekey(a, b, s) { sub(" >/dev/null 2>&1 \|\|:", ""); } + # fedora extras macros + if (/%__fe_useradd/) { + sub("%__fe_useradd", "%useradd -u "); + sub(" 2> /dev/null \|\| :", ""); + sub(" >/dev/null 2>&1 \|\|:", ""); + sub(" &>/dev/null \\|\\| :", ""); + } + + if (/%__fe_groupadd/) { + sub("%__fe_groupadd", "%groupadd -g "); + sub(" &>/dev/null \\|\\| :", ""); + } + # %useradd and %groupadd may not be wrapped if (/%(useradd|groupadd).*\\$/) { a = $0; getline; @@ -607,6 +633,20 @@ function b_makekey(a, b, s) { /^%post/, (!/^%post/ && $0 ~ SECTIONS) { preamble = 0 + + # fedora extras macros + sub("%__chkconfig", "/sbin/chkconfig"); + + sub("update-desktop-database &> /dev/null \\|\\| :", "%update_desktop_database"); + sub("touch --no-create %{_datadir}/icons/hicolor", "%update_icon_cache_post hicolor"); + sub("if \\[ -x %{_bindir}/gtk-update-icon-cache \\]; then\n\t%{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor \|\| :\nfi", ""); + + sub("export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`", "") + if (/gconftool-2 --makefile-install-rule/) { + sub("gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/", "%gconf_schema_install ") + sub("> /dev/null", ""); + } + use_macros() } /^%preun/, (!/^%preun/ && $0 ~ SECTIONS) { @@ -615,6 +655,14 @@ function b_makekey(a, b, s) { } /^%postun/, (!/^%postun/ && $0 ~ SECTIONS) { preamble = 0 + + # fedora extras macros + if (/%__fe_userdel|%__fe_groupdel/) { + sub("%__fe_groupdel", "%groupremove"); + sub("%__fe_userdel", "%userremove"); + sub(" &>/dev/null \\|\\| :", ""); + } + use_script_macros() } /^%triggerin/, (!/^%triggerin/ && $0 ~ SECTIONS) { @@ -1127,7 +1175,10 @@ function use_macros() gsub(py_sitescriptdir, "%{py_sitescriptdir}") gsub(py_sitedir, "%{py_sitedir}") gsub(py_scriptdir, "%{py_scriptdir}") - gsub("%{_libdir}/python2.4/site-packages", "%{py_sitedir}") + + gsub(py3_sitescriptdir, "%{py3_sitescriptdir}") + gsub(py3_sitedir, "%{py3_sitedir}") + gsub(py3_scriptdir, "%{py3_scriptdir}") gsub(ruby_archdir, "%{ruby_archdir}") gsub(ruby_ridir, "%{ruby_ridir}") @@ -1218,8 +1269,14 @@ function use_macros() continue; if ($c ~ sysconfdir "/{?samba") continue; + if ($c ~ sysconfdir "/{?xdg") + continue; if ($c ~ sysconfdir "/shells") continue; + if ($c ~ sysconfdir "/inittab") + continue; + if ($c ~ sysconfdir "/init") + continue; if ($c ~ sysconfdir "/ppp") continue; if ($c ~ sysconfdir "/dbus-1") @@ -1361,7 +1418,9 @@ function use_macros() $0 = fixedsub("%__install", "install", $0); # split configure line to multiple lines - if (/%configure / && !/\\$/) { + if (/%configure +$/) { + sub( / +$/, "" ); + } else if (/%configure / && !/\\$/) { $0 = format_configure($0); } @@ -1570,13 +1629,10 @@ function use_files_macros( i, n, t, a, l) t = substr($0, 0, l); s = substr($0, l + 1, RLENGTH - l - length("-py"py_ver".egg-info")); if (match(s, "[^-]+$")) { -#printf("s[%s]; start[%d]; length[%d]\n", s, RSTART, RLENGTH); if (RSTART > 1) { s = substr(s, 0, RSTART - 1); } -#printf("s2[%s]\n", s); print "%if \"%{py_ver}\" > \"2.4\"" -#print t "/.+.egg-info" gsub(t "/.+.egg-info", t "/" s "-*.egg-info"); print print "%endif" @@ -1659,12 +1715,18 @@ function cflags(var) return 1 } +# return whole matched pattern +function matchstr(str, pat) +{ + match(str, "[^/]+$"); + return substr(str, RSTART, RLENGTH); +} + function unify_url(url) { # sourceforge urls # Docs about sourceforge mirror system: http://sourceforge.net/apps/trac/sourceforge/wiki/Mirrors - # TODO: SF unify: http://downloads.sourceforge.net/PROJECT/TARBALL # 1. unify domains sub("^http://prdownloads\.sourceforge\.net/", "http://downloads.sourceforge.net/", url) @@ -1675,13 +1737,6 @@ function unify_url(url) sub("^http://dl\.sf\.net/", "http://downloads.sourceforge.net/", url) sub("^http://downloads\.sourceforge\.net/sourceforge/", "http://downloads.sourceforge.net/", url) - # 2. special hacks - # 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); - } - # 3. unify urls if (url ~ /sourceforge.net/) { sub("[?&]big_mirror=.*$", "", url); @@ -1691,6 +1746,18 @@ function unify_url(url) sub("/download$", "", url); } + # SF: 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); + } + + # SF unify: http://downloads.sourceforge.net/PROJECT/TARBALL + # http://downloads.sourceforge.net/project/PROJECT/FILE/VERSION/%{name}-%{version}.zip + if (match(url, "^http://downloads.sourceforge.net/project/[^/]+")) { + url = sprintf("http://downloads.sourceforge.net/%s/%s", substr(url, 42, RLENGTH - 41), matchstr(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) @@ -1755,6 +1822,16 @@ function kill_preamble_macros() $2 = demacroize($2); $2 = unify_url($2) } + + # fedora extras + if (/%{\?FE_USERADD_REQ}/) { + $0 = ""; + print "BuildRequires: rpmbuild(macros) >= 1.202" + print "Provides: user(xxx)" + print "Requires(postun): /usr/sbin/userdel" + print "Requires(pre): /bin/id" + print "Requires(pre): /usr/sbin/useradd" + } } function get_epoch(pkg, ver, epoch) @@ -1808,7 +1885,6 @@ function add_br(br) BR[BR_count++] = br } - # Load rpm macros # you should update the list also in adapter when making changes here function import_rpm_macros() { @@ -1821,7 +1897,8 @@ function import_rpm_macros() { exit(rc = 1); } - if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.46) { + # update this version dep each time some new macro export is added + if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.47) { print "adapter shell script is outdated, please cvs up it" > "/dev/stderr" do_not_touch_anything = 1 exit(rc = 1); @@ -1863,6 +1940,11 @@ function import_rpm_macros() { py_scriptdir = ENVIRON["py_scriptdir"] py_ver = ENVIRON["py_ver"] + py3_sitescriptdir = ENVIRON["py3_sitescriptdir"] + py3_sitedir = ENVIRON["py3_sitedir"] + py3_scriptdir = ENVIRON["py3_scriptdir"] + py3_ver = ENVIRON["py3_ver"] + ruby_archdir = ENVIRON["ruby_archdir"] ruby_ridir = ENVIRON["ruby_ridir"] ruby_rubylibdir = ENVIRON["ruby_rubylibdir"] @@ -1875,7 +1957,6 @@ function import_rpm_macros() { tmpdir = ENVIRON["tmpdir"] } - # php virtual deps as discussed in devel-en function replace_php_virtual_deps() { pkg = $2 @@ -1905,6 +1986,75 @@ function replace_php_virtual_deps() { } } +function replace_groupnames(group) { + group = replace(group, "Amusements/Games", "Applications/Games"); + group = replace(group, "Amusements/Games/Strategy/Real Time", "X11/Applications/Games/Strategy"); + group = replace(group, "Application/Multimedia", "Applications/Multimedia"); + group = replace(group, "Application/System", "Applications/System"); + group = replace(group, "Applications/Compilers", "Development/Languages"); + group = replace(group, "Applications/Daemons", "Daemons"); + group = replace(group, "Applications/Internet", "Applications/Networking"); + group = replace(group, "Applications/Internet/Peer to Peer", "Applications/Networking"); + group = replace(group, "Applications/Productivity", "X11/Applications"); + group = replace(group, "Applications/Security", "Applications/System"); + group = replace(group, "Applications/Web", "Applications/WWW"); + group = replace(group, "Database", "Applications/Databases"); + group = replace(group, "Development/C", "Development/Libraries"); + group = replace(group, "Development/Code Generators", "Development"); + group = replace(group, "Development/Docs", "Documentation"); + group = replace(group, "Development/Documentation", "Documentation"); + group = replace(group, "Development/Java", "Development/Languages/Java"); + group = replace(group, "Development/Languages/C and C++", "Libraries"); + group = replace(group, "Development/Languages/Other", "Development/Languages");; + group = replace(group, "Development/Languages/Ruby", "Development/Languages"); + group = replace(group, "Development/Libraries/C and C++", "Development/Libraries"); + group = replace(group, "Development/Libraries/Java", "Development/Languages/Java"); + group = replace(group, "Development/Libraries/Python", "Development/Languages/Python"); + group = replace(group, "Development/Libraries/TCL", "Development/Languages/Tcl");; + group = replace(group, "Development/Other", "Development"); + group = replace(group, "Development/Python", "Development/Languages/Python"); + group = replace(group, "Development/Testing", "Development"); + group = replace(group, "Editors", "Applications/Text"); + group = replace(group, "Emulators", "Applications/Emulators"); + group = replace(group, "File tools", "Applications/File"); + group = replace(group, "Games", "Applications/Games"); + group = replace(group, "Library/Development", "Development/Libraries"); + group = replace(group, "Networking/Deamons", "Networking/Daemons"); + group = replace(group, "Networking/Mail", "Applications/Mail"); + group = replace(group, "Networking/Other", "Networking"); + group = replace(group, "Productivity/Databases/Servers", "Applications/Databases"); + group = replace(group, "Productivity/Multimedia/Other", "X11/Applications/Multimedia"); + group = replace(group, "Productivity/Networking/Web/Servers", "Networking/Daemons/HTTP");; + group = replace(group, "Shells", "Applications/Shells"); + group = replace(group, "System Environment/Base", "Base"); + group = replace(group, "System Environment/Daemons", "Daemons"); + group = replace(group, "System Environment/Kernel", "Base/Kernel"); + group = replace(group, "System Environment/Libraries", "Libraries"); + group = replace(group, "System Tools", "Applications/System"); + group = replace(group, "System", "Base"); + group = replace(group, "System/Base", "Base"); + group = replace(group, "System/Kernel and hardware", "Base/Kernel"); + group = replace(group, "System/Libraries", "Libraries"); + group = replace(group, "System/Servers", "Daemons"); + group = replace(group, "Text Processing/Markup/HTML", "Applications/Text"); + group = replace(group, "Text Processing/Markup/XML", "Applications/Text"); + group = replace(group, "Text tools", "Applications/Text"); + group = replace(group, "User Interface/Desktops", "X11/Applications"); + group = replace(group, "Utilities/System", "Applications/System"); + group = replace(group, "Web/Database", "Applications/WWW"); + group = replace(group, "X11/GNOME", "X11/Applications"); + group = replace(group, "X11/GNOME/Applications", "X11/Applications"); + group = replace(group, "X11/GNOME/Development/Libraries", "X11/Development/Libraries"); + group = replace(group, "X11/Games", "X11/Applications/Games"); + group = replace(group, "X11/Games/Strategy", "X11/Applications/Games/Strategy"); + group = replace(group, "X11/Library", "X11/Libraries"); + group = replace(group, "X11/Utilities", "X11/Applications"); + group = replace(group, "X11/XFree86", "X11"); + group = replace(group, "X11/Xserver", "X11/Servers"); + + return group; +} + function replace_requires() { sub(/^python-setuptools-devel$/, "python-distribute", $2); @@ -1916,23 +2066,33 @@ function replace_requires() { # bad package.xml, see http://pear.php.net/bugs/bug.php?id=17779 sub(/^php-php-gtk/, "php-gtk2", $2); - # jpackages + # jpackages / fedora java packages sub(/^antlr3$/, "java-antlr3", $2); sub(/^avalon-framework$/, "java-avalon-framework", $2); sub(/^avalon-logkit$/, "java-avalon-logkit", $2); sub(/^axis$/, "java-axis", $2); + sub(/^bouncycastle$/, "java-bcprov", $2); + sub(/^bouncycastle-mail$/, "java-bcmail", $2); + sub(/^bouncycastle-tsp$/, "java-bctsp", $2); sub(/^bsf$/, "java-bsf", $2); + sub(/^dom4j$/, "java-dom4j", $2); + sub(/^flute$/, "java-flute", $2); sub(/^gnu-regexp$/, "java-gnu-regexp", $2); sub(/^gnu.regexp$/, "java-gnu-regexp", $2); sub(/^hamcrest$/, "java-hamcrest", $2); + sub(/^itext$/, "java-itext", $2); sub(/^jaas$/, "java(jaas)", $2); sub(/^jaf$/, "java(jaf)", $2); sub(/^jakarta-ant$/, "ant", $2); + sub(/^jakarta-commons-codec$/, "java-commons-codec", $2); sub(/^jakarta-commons-httpclient$/, "java-commons-httpclient", $2); + sub(/^jakarta-commons-logging$/, "java-commons-logging", $2); + sub(/^jakarta-commons-logging$/, "java-commons-logging", $2); sub(/^jakarta-log4j$/, "java-log4j", $2); sub(/^jakarta-oro$/, "java-oro", $2); sub(/^jakarta-servletapi$/, "java(servlet)", $2); sub(/^java-devel$/, "jdk", $2); + sub(/^java-xerces$/, "java(jaxp_parser_impl)", $2); sub(/^java\(JSP\)$/, "java(jsp)", $2); sub(/^java\(JavaServerFaces\)$/, "java(javaserverfaces)", $2); sub(/^java\(Portlet\)$/, "java(portlet)", $2); @@ -1952,21 +2112,35 @@ function replace_requires() { sub(/^jsse$/, "java(jsse)", $2); sub(/^jta$/, "java(jta)", $2); sub(/^junit$/, "java-junit", $2); + sub(/^junit4$/, "java-junit", $2); sub(/^ldapjdk$/, "ldapsdk", $2); + sub(/^libbase$/, "java-libbase", $2); + sub(/^libfonts$/, "java-libfonts", $2); + sub(/^libformula$/, "java-libformula", $2); + sub(/^liblayout$/, "java-liblayout", $2); + sub(/^libloader$/, "java-libloader", $2); + sub(/^librepository$/, "java-librepository", $2); + sub(/^libserializer$/, "java-libserializer", $2); sub(/^log4j$/, "java-log4j", $2); sub(/^logging-log4j$/, "java-log4j", $2); sub(/^oro$/, "java-oro", $2); + sub(/^pdf-renderer$/, "java-pdf-renderer", $2); + sub(/^pentaho-libxml$/, "java-libxml", $2); sub(/^rhino$/, "java-rhino", $2); + sub(/^sac$/, "java-sac", $2); sub(/^saxon-scripts$/, "saxon", $2); sub(/^servlet$/, "java(servlet)", $2); sub(/^uddi4j$/, "java-uddi4j", $2); + sub(/^ws-jaxme$/, "java-jaxme", $2); sub(/^wsdl4j$/, "java-wsdl4j", $2); sub(/^xalan-j$/, "java-xalan", $2); sub(/^xalan-j2$/, "java-xalan", $2); - sub(/^xerces-j$/, "java-xerces", $2); - sub(/^xerces-j2$/, "java-xerces", $2); - sub(/^xml-commons-apis$/, "java-xml-commons-apis", $2); + sub(/^xerces-j$/, "java(jaxp_parser_impl)", $2); + sub(/^xerces-j2$/, "java(jaxp_parser_impl)", $2); + sub(/^xml-commons-apis$/, "java-xml-commons", $2); sub(/^xml-commons-resolver$/, "java-xml-commons-resolver", $2); + sub(/^xmldb-api$/, "java-xmldb", $2); + sub(/^xmldb-api-sdk$/, "java-xmldb-sdk", $2); # fedora / redhat sub(/^Django$/, "python-django", $2); @@ -1983,32 +2157,50 @@ function replace_requires() { sub(/^gamin-python$/, "python-gamin", $2); sub(/^gcc-c\+\+$/, "libstdc++-devel", $2); sub(/^gnome-python2-extras$/, "python-gnome-extras", $2); + sub(/^gnome-python2-gconf$/, "python-gnome-gconf", $2); + sub(/^gnome-python2-gnomekeyring$/, "python-gnome-desktop-keyring", $2); sub(/^gnome-python2-gtkspell$/, "python-gnome-extras-gtkspell", $2); sub(/^gtk-sharp2-devel$/, "dotnet-gtk-sharp2-devel", $2); sub(/^gtk2$/, "gtk+2", $2); sub(/^gtk2-devel$/, "gtk+2-devel", $2); + sub(/^gtk3-devel$/, "gtk+3-devel", $2); sub(/^initscripts$/, "rc-scripts", $2); sub(/^iproute$/, "iproute2", $2); sub(/^iscsi-initiator-utils$/, "open-iscsi", $2); + sub(/^keyutils-libs-devel$/, "keyutils-devel", $2); sub(/^libXft-devel$/, "xorg-lib-libXft-devel", $2); sub(/^libXrandr-devel$/, "xorg-lib-libXrandr-devel", $2); + sub(/^libacl-devel$/, "acl-devel", $2); sub(/^libcurl-devel$/, "curl-devel", $2); + sub(/^libgudev1-devel$/, "udev-glib-devel", $2); sub(/^libsrtp-devel$/, "srtp-devel", $2); + sub(/^libtdb$/, "tdb", $2); + sub(/^libtdb-devel$/, "tdb-devel", $2); + sub(/^libtevent$/, "tevent", $2); + sub(/^libtevent-devel$/, "tevent-devel", $2); sub(/^mod_wsgi$/, "apache-mod_wsgi", $2); sub(/^notify-python$/, "python-pynotify", $2); sub(/^pcsc-lite-ccid$/, "pcsc-driver-ccid", $2); sub(/^pulseaudio-libs-devel$/, "pulseaudio-devel", $2); sub(/^pyOpenSSL$/, "python-pyOpenSSL", $2); + sub(/^pyflakes$/, "python-pyflakes", $2); sub(/^pygobject2$/, "python-pygobject", $2); sub(/^pygtk2$/, "python-pygtk", $2); sub(/^pygtk2-devel$/, "python-pygtk-devel", $2); + sub(/^pygtk2-libglade$/, "python-pygtk-glade", $2); + sub(/^pysvn$/, "python-pysvn", $2); + sub(/^pytalloc$/, "python-talloc", $2); + sub(/^pytalloc-devel$/, "python-talloc-devel", $2); sub(/^python-enchant$/, "python-pyenchant", $2); sub(/^python-imaging$/, "python-PIL", $2); sub(/^python-imaging-tk$/, "python-PIL-tk", $2); sub(/^python-pygtk$/, "python-pygtk-gtk", $2); + sub(/^python-recaptcha-client$/, "python-recaptcha", $2); + sub(/^python-twisted-core$/, "python-TwistedCore", $2); sub(/^python-twisted-core$/, "python-TwistedCore", $2); sub(/^python-twisted-names$/, "python-TwistedNames", $2); sub(/^python2-devel$/, "python-devel", $2); + sub(/^pytz$/, "python-pytz", $2); sub(/^qt4-devel$/, "qt4-build", $2); sub(/^qt4-webkit-devel$/, "QtWebKit-devel", $2); sub(/^qtlockedfile-devel$/, "QtLockedFile-devel", $2); @@ -2017,9 +2209,19 @@ function replace_requires() { sub(/^sip-devel$/, "python-sip-devel", $2); sub(/^tftp-server$/, "tftpdaemon", $2); sub(/^tkinter$/, "python-tkinter", $2); + sub(/^urw-fonts$/, "fonts-Type1-urw", $2); sub(/^xapian-bindings-python$/, "python-xapian", $2); sub(/^xorg-x11-server-sdk$/, "xorg-xserver-server-devel", $2); + # mandriva + sub(/^python-gobject-devel$/, "python-pygobject-devel", $2); + sub(/^python-pyrex$/, "python-Pyrex", $2); + sub(/^webkitgtk-devel$/, "gtk-webkit-devel", $2); + sub(/^python-curl$/, "python-pycurl", $2); + sub(/^python-webkitgtk$/, "python-pywebkitgtk", $2); + sub(/^pygtk2.0$/, "python-pygtk-gtk", $2); + sub(/^gnome-python-gconf$/, "python-gnome-gconf", $2); + # debian / ubuntu sub(/^blkid-dev$/, "libblkid-devel", $2); sub(/^ext2fs-dev$/, "e2fsprogs-devel", $2); @@ -2053,11 +2255,17 @@ function replace_requires() { sub(/^libxslt1-dev$/, "libxslt-devel", $2); sub(/^libxss-dev$/, "xorg-lib-libXScrnSaver-devel", $2); sub(/^mesa-common-dev$/, "OpenGL-devel", $2); + sub(/^libudev$/, "udev-libs", $2); + sub(/^tcp_wrappers-devel$/, "libwrap-devel", $2); + sub(/^vala-tools$/, "vala", $2); + sub(/^vala-devel$/, "vala", $2); # altlinux + sub(/^libgit-devel$/, "git-core-devel", $2); sub(/^libncurses-devel$/, "ncurses-devel", $2); sub(/^libncursesxx-devel$/, "ncurses-c++-devel", $2); sub(/^libpcre-devel$/, "pcre-devel", $2); + sub(/^libssl-devel$/, "openssl-devel", $2); # suse sub(/^alsa-devel$/, "alsa-lib-devel", $2); @@ -2073,72 +2281,4 @@ function replace_requires() { replace_php_virtual_deps() } -function replace_groupnames(group) { - group = replace(group, "Amusements/Games", "Applications/Games"); - group = replace(group, "Amusements/Games/Strategy/Real Time", "X11/Applications/Games/Strategy"); - group = replace(group, "Application/Multimedia", "Applications/Multimedia"); - group = replace(group, "Application/System", "Applications/System"); - group = replace(group, "Applications/Compilers", "Development/Languages"); - group = replace(group, "Applications/Daemons", "Daemons"); - group = replace(group, "Applications/Internet", "Applications/Networking"); - group = replace(group, "Applications/Internet/Peer to Peer", "Applications/Networking"); - group = replace(group, "Applications/Productivity", "X11/Applications"); - group = replace(group, "Applications/Security", "Applications/System"); - group = replace(group, "Applications/Web", "Applications/WWW"); - group = replace(group, "Database", "Applications/Databases"); - group = replace(group, "Development/C", "Development/Libraries"); - group = replace(group, "Development/Code Generators", "Development"); - group = replace(group, "Development/Docs", "Documentation"); - group = replace(group, "Development/Documentation", "Documentation"); - group = replace(group, "Development/Java", "Development/Languages/Java"); - group = replace(group, "Development/Languages/C and C++", "Libraries"); - group = replace(group, "Development/Languages/Other", "Development/Languages");; - group = replace(group, "Development/Languages/Ruby", "Development/Languages"); - group = replace(group, "Development/Libraries/C and C++", "Development/Libraries"); - group = replace(group, "Development/Libraries/Java", "Development/Languages/Java"); - group = replace(group, "Development/Libraries/Python", "Development/Languages/Python"); - group = replace(group, "Development/Libraries/TCL", "Development/Languages/Tcl");; - group = replace(group, "Development/Other", "Development"); - group = replace(group, "Development/Python", "Development/Languages/Python"); - group = replace(group, "Development/Testing", "Development"); - group = replace(group, "Editors", "Applications/Text"); - group = replace(group, "Emulators", "Applications/Emulators"); - group = replace(group, "File tools", "Applications/File"); - group = replace(group, "Games", "Applications/Games"); - group = replace(group, "Library/Development", "Development/Libraries"); - group = replace(group, "Networking/Deamons", "Networking/Daemons"); - group = replace(group, "Networking/Other", "Networking"); - group = replace(group, "Productivity/Databases/Servers", "Applications/Databases"); - group = replace(group, "Productivity/Multimedia/Other", "X11/Applications/Multimedia"); - group = replace(group, "Productivity/Networking/Web/Servers", "Networking/Daemons/HTTP");; - group = replace(group, "Shells", "Applications/Shells"); - group = replace(group, "System Environment/Base", "Base"); - group = replace(group, "System Environment/Daemons", "Daemons"); - group = replace(group, "System Environment/Kernel", "Base/Kernel"); - group = replace(group, "System Environment/Libraries", "Libraries"); - group = replace(group, "System Tools", "Applications/System"); - group = replace(group, "System", "Base"); - group = replace(group, "System/Base", "Base"); - group = replace(group, "System/Kernel and hardware", "Base/Kernel"); - group = replace(group, "System/Libraries", "Libraries"); - group = replace(group, "System/Servers", "Daemons"); - group = replace(group, "Text Processing/Markup/HTML", "Applications/Text"); - group = replace(group, "Text Processing/Markup/XML", "Applications/Text"); - group = replace(group, "Text tools", "Applications/Text"); - group = replace(group, "User Interface/Desktops", "X11/Applications"); - group = replace(group, "Utilities/System", "Applications/System"); - group = replace(group, "Web/Database", "Applications/WWW"); - group = replace(group, "X11/GNOME", "X11/Applications"); - group = replace(group, "X11/GNOME/Applications", "X11/Applications"); - group = replace(group, "X11/GNOME/Development/Libraries", "X11/Development/Libraries"); - group = replace(group, "X11/Games", "X11/Applications/Games"); - group = replace(group, "X11/Games/Strategy", "X11/Applications/Games/Strategy"); - group = replace(group, "X11/Library", "X11/Libraries"); - group = replace(group, "X11/Utilities", "X11/Applications"); - group = replace(group, "X11/XFree86", "X11"); - group = replace(group, "X11/Xserver", "X11/Servers"); - - return group; -} - # vim:ts=4:sw=4