diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh index 53dabcd0a7..31e11ddc48 100644 --- a/xbps-src/shutils/metadata.sh +++ b/xbps-src/shutils/metadata.sh @@ -1,5 +1,5 @@ #- -# Copyright (c) 2008-2010 Juan Romero Pardines. +# Copyright (c) 2008-2011 Juan Romero Pardines. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -57,7 +57,8 @@ xbps_write_metadata_pkg() revision openrc_services system_accounts system_groups \ preserve keep_empty_dirs xml_entries sgml_entries \ xml_catalogs sgml_catalogs gconf_entries gconf_schemas \ - gtk_iconcache_dirs font_dirs dkms_modules + gtk_iconcache_dirs font_dirs dkms_modules provides \ + conflicts . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template pkgname=${subpkg} set_tmpl_common_vars @@ -355,6 +356,16 @@ _EOF echo "" >> $TMPFPROPS fi + # Provides virtual package(s). + if [ -n "$provides" ]; then + echo "provides" >> $TMPFPROPS + echo "" >> $TMPFPROPS + for f in ${provides}; do + echo "$(echo $f|sed "s|<|\<|g;s|>|\>|g")" >> $TMPFPROPS + done + echo "" >> $TMPFPROPS + fi + # Terminate the property list file. echo "" >> $TMPFPROPS echo "" >> $TMPFPROPS diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in index 0c66ecd24a..bd70348b3c 100644 --- a/xbps-src/shutils/tmpl_funcs.sh.in +++ b/xbps-src/shutils/tmpl_funcs.sh.in @@ -1,5 +1,5 @@ #- -# Copyright (c) 2008-2010 Juan Romero Pardines. +# Copyright (c) 2008-2011 Juan Romero Pardines. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -99,7 +99,7 @@ reset_tmpl_vars() only_for_archs conf_files keep_libtool_archives \ noarch subpackages sourcepkg gtk_iconcache_dirs \ abi_depends api_depends triggers openrc_services \ - replaces system_accounts system_groups \ + replaces system_accounts system_groups provides \ build_wrksrc create_wrksrc broken_as_needed \ ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \ gconf_entries gconf_schemas stow_copy stow_copy_files \