Release 1.35

VERSION

@@ -1,2 +1,2 @@
-VERSION=1.33
+VERSION=1.35
 RELEASE=1mamba

lib/libspec.lib.in

@@ -1142,7 +1142,6 @@ rpmvars.solve "$filesname" "$specfile")" )
             dbg_filename="$(package.generate_name -p -a ${SPEC_BUILDARCH:-$BUILD_ARCH} -t rpm \
                -n ${SPEC_NAME}-${rpm_macro_debug_package_suffix} -v ${SPEC_VERSION} -r ${SPEC_RELEASE%%[^0-9\.]*})"
          fi
-         notify.warning "debugpkg: ${SPEC_BUILDARCH:-$BUILD_ARCH} $dbg_filename"
          if [[ -e "$dbg_filename" ]]; then
                # rpm macro for creating debug packages
                SPEC_TARGET=( ${SPEC_TARGET[@]} \

plugins/pck-update.in

@@ -34,6 +34,7 @@ me=(${0##*/} "@version@" "@date@")
 # output verbosity
 let "verbose = 1"
 #
+let "noprep = 0"
 let "cleanup = 0"
 let "spec_format = 0"
 let "rebuild = 0"
@@ -97,7 +98,7 @@ function usage() {
              [--packager-email \"email@domain\" ] [--nosrpm|--norpm] \\
              [--force-update] [--force-build] [--force-install] \\
              [--force-download] [--ignore-test t1[,t2,...]] \\
-             [-c] [-f] [-L] [-R] [-C <conf_file>]
+             [-p] [-c] [-f] [-L] [-R] [-C <conf_file>]
 
 "$"where the above options mean"":
  -u, --update       "$"Update the package <pck> to version <ver> and release <rel>""
@@ -147,6 +148,7 @@ function usage() {
      --list-check   "$"action"" 5: "$"Do a \`list check'""
  -b, --update-autobuildreq""
                     "$"action"" 6: "$"Replace the block AUTOBUILDREQ""
+ -p, --noprep       "$"Skip rpmbuild %prep macro when retrying building from an existing builddir""
  -c, --clear        "$"Remove all the temporary files except (s)rpm packages""
  -f, --format       "$"Enable specfile autoformatting""
  -L, --log          "$"Unable logging to file (logging dir: \`\$logging_dir')""
@@ -196,14 +198,14 @@ for arg in $@; do
 done
 
 exec_options=`LC_ALL=C getopt \
-   -o ua:d:l:S:A:bcfLRC:DqhV \
+   -o ua:d:l:S:A:pbcfLRC:DqhV \
    --long \
 update,action:,define:,login:,specfile:,arch:,\
 server-download:,server-upload:,server:,\
 changelog:,packager-fullname:,packager-email:,distro-rpm:,\
 nosrpm,norpm,list-check,update-autobuildreq,\
 force-update,force-build,force-install,force-download,force,\
-ignore-test:,clear,format,log,rebuild,root:,\
+ignore-test:,noprep,clear,format,log,rebuild,root:,\
 frontend_opts:,colors:,config:,\
 debug,quiet,help,version \
    -n "$me" -- "$@"`
@@ -281,6 +283,8 @@ while :; do
          let "force_upload = 1" ;;
       --ignore-test)
          ignore_test_list=$2; shift ;;
+      -p|--noprep)
+         noprep=1 ;;
       -c|--clear)
          cleanup=1 ;;
       -f|--format)
@@ -2122,6 +2126,8 @@ ${proxy:+--proxy $proxy} ${proxy_user:+--proxy-user $proxy_user} \
          [ "$BUILD_ARCH" != "$target_cpu" ] &&
             USER_RPMDEFINE_OPTS="--target $target_cpu $USER_RPMDEFINE_OPTS"
 
+         [ "$noprep" = "1" ] && rpmbuild_opts="$rpmbuild_opts --noprep"
+
          [ "$cleanup" = "1" ] && rpmbuild_opts="$rpmbuild_opts --clean"
 
          # note: exit with error when build requirements are missing

po/it/autospec.po

@@ -275,9 +275,6 @@ msgstr  "pacchetto non trovato"
 msgid   "unknown action"
 msgstr  "azione sconosciuta"
 
-msgid   "not the expected package version"
-msgstr  "non è la versione di pacchetto prevista"
-
 msgid   "cloning git repository"
 msgstr  "clonazione del repository"
 
@@ -532,6 +529,11 @@ msgstr  "Cerca i file non pacchettizzati"
 msgid   "Replace the block AUTOBUILDREQ"
 msgstr  "Aggiorna il blocco AUTOBUILDREQ"
 
+msgid   "Skip rpmbuild %prep macro when retrying building from an existing "
+        "builddir"
+msgstr  "Salta la macro %prep di rpmbuild per riprovare la compilazione da "
+        "una builddir esistente"
+
 msgid   "Remove all the temporary files except (s)rpm packages"
 msgstr  "Rimuove tutti i file temporanei"
 
@@ -1102,3 +1104,6 @@ msgid   "${NOTE}Security checks: ${#rpmpkg_name[@]} package(s) checked: "
         "${NORM}${WARN}$total_issues${NORM}${NOTE} warning(s).${NORM}"
 msgstr  "${NOTE}Controlli di sicurezza: pacchetti rpm: ${#rpmpkg_name[@]}; "
         "problemi riscontrati: ${NORM}${WARN}$total_issues${NORM}"
+
+#~ msgid        "not the expected package version"
+#~ msgstr       "non è la versione di pacchetto prevista"

templates/kf6

@@ -39,10 +39,6 @@ Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description -n lib%{name}-devel
 This package contains libraries and header files for developing applications that use %{name}.
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %prep
 %setup -q
 

templates/library

@@ -52,8 +52,6 @@ Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 @else:pck_library
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 @fi:pck_library
-## note: you can add this requirement if .pc files are provided by this package
-#Requires:      pkg-config
 
 @if:pck_library
 %description -n lib%{name}-devel
@@ -84,10 +82,6 @@ Requires:      gtk-doc
 This package includes the %{name} API documentation.
 @fi:pck_apidocs
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %prep
 %setup -q
 

templates/standard

@@ -45,10 +45,6 @@ Requires:      gtk-doc
 This package includes the %{name} API documentation.
 @fi:pck_apidocs
 
-@if:debug_package
-%debug_package
-@fi:debug_package
-
 %prep
 %setup -q