- do not add FILENAME_TAG and FILESIZE_TAG to hdlist anymore,

  deprecate ->filename and ->header_filename,
  deprecate URPM::Build build_hdlist and parse_rpms_build_headers

(backport from HEAD, needed for next commit)

4 files changed, 15 insertions, 48 deletions

diff --git a/NEWS b/NEWS
index 7478649..3322d98 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- do not add FILENAME_TAG and FILESIZE_TAG to hdlist anymore,
+  deprecate ->filename and ->header_filename,
+  deprecate URPM::Build build_hdlist and parse_rpms_build_headers
+
 Version 2.09.1 - 17 December 2007, by Pascal "Pixel" Rigaux
 
 - suggests: 
diff --git a/URPM.pm b/URPM.pm
index 4cbb884..f6a9ffa 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -500,10 +500,6 @@ Writes a line of information in a synthesis file.
 
 =item $package->exclusivearchs()
 
-=item $package->filename()
-
-The rpm's file name.
-
 =item $package->files()
 
 List of files in this rpm.
@@ -571,8 +567,6 @@ Return an array of human readable view of tag values. $tagid is the numerical va
 
 =item $package->group()
 
-=item $package->header_filename()
-
 =item $package->id()
 
 =item $package->installtid()
diff --git a/URPM.xs b/URPM.xs
index 409b277..17cfba5 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -98,9 +98,6 @@ typedef struct s_Package* URPM__Package;
 #define FLAG_RATE_INVALID     0
 
 
-#define FILENAME_TAG 1000000
-#define FILESIZE_TAG 1000001
-
 #define FILTER_MODE_ALL_FILES     0
 #define FILTER_MODE_UPGRADE_FILES 1
 #define FILTER_MODE_CONF_FILES    2
@@ -797,16 +794,10 @@ pack_header(URPM__Package pkg) {
       char *version = get_name(pkg->h, RPMTAG_VERSION);
       char *release = get_name(pkg->h, RPMTAG_RELEASE);
       char *arch = headerIsEntry(pkg->h, RPMTAG_SOURCERPM) ? get_name(pkg->h, RPMTAG_ARCH) : "src";
-      char *filename = get_name(pkg->h, FILENAME_TAG);
 
       p += snprintf(buff, sizeof(buff), "%s-%s-%s.%s@%d@%d@%s@", name, version, release, arch,
 		    get_int(pkg->h, RPMTAG_EPOCH), get_int(pkg->h, RPMTAG_SIZE), get_name(pkg->h, RPMTAG_GROUP));
-      if (filename) snprintf(p, sizeof(buff) - (p-buff), "%s-%s-%s.%s.rpm", name, version, release, arch);
-      if (!filename || !strcmp(p, filename)) {
-	p[-1] = 0;
-      } else {
-	p = p + 1 + snprintf(p, sizeof(buff) - (p-buff), "%s", filename);
-      }
+      p[-1] = 0;
       pkg->info = memcpy(malloc(p-buff), buff, p-buff);
     }
     if (pkg->requires == NULL && pkg->suggests == NULL)
@@ -1237,8 +1228,6 @@ update_header(char *filename, URPM__Package pkg, int keep_all_tags, int vsflags)
 
 	  basename = strrchr(filename, '/');
 	  size = fdSize(fd);
-	  headerAddEntry(header, FILENAME_TAG, RPM_STRING_TYPE, basename != NULL ? basename + 1 : filename, 1);
-	  headerAddEntry(header, FILESIZE_TAG, RPM_INT32_TYPE, &size, 1);
 
 	  if (pkg->h && !(pkg->flag & FLAG_NO_HEADER_FREE)) headerFree(pkg->h);
 	  pkg->h = header;
@@ -1952,50 +1941,34 @@ Pkg_group(pkg)
     XPUSHs(sv_2mortal(newSVpv_utf8(get_name(pkg->h, RPMTAG_GROUP), 0)));
   }
 
+# deprecated
 void
 Pkg_filename(pkg)
   URPM::Package pkg
   PPCODE:
   if (pkg->info) {
-    char *s, *eon, *eos;
+    char *eon;
 
     if ((eon = strchr(pkg->info, '@')) != NULL) {
-      if ((s = strchr(eon+1, '@')) != NULL && (s = strchr(s+1, '@')) != NULL && (s = strchr(s+1, '@')) != NULL) {
-	eos = strchr(s+1, '@');
-	XPUSHs(sv_2mortal(newSVpv(s+1, eos != NULL ? eos-s-1 : 0)));
-      } else {
 	char savbuf[4];
 	memcpy(savbuf, eon, 4); /* there should be at least epoch and size described so (@0@0 minimum) */
 	memcpy(eon, ".rpm", 4);
 	XPUSHs(sv_2mortal(newSVpv(pkg->info, eon-pkg->info+4)));
 	memcpy(eon, savbuf, 4);
-      }
     }
   } else if (pkg->h) {
-    char *filename = get_name(pkg->h, FILENAME_TAG);
-
-    if (filename != NULL)
-      XPUSHs(sv_2mortal(newSVpv(filename, 0)));
   }
 
+# deprecated
 void
 Pkg_header_filename(pkg)
   URPM::Package pkg
   PPCODE:
   if (pkg->info) {
-    char *s, *eon, *eos;
+    char *eon;
 
     if ((eon = strchr(pkg->info, '@')) != NULL) {
-      if ((s = strchr(eon+1, '@')) != NULL && (s = strchr(s+1, '@')) != NULL && (s = strchr(s+1, '@')) != NULL) {
-	eos = strstr(s+1, ".rpm");
-	if (eos != NULL) *eos = 0;
-	if (eon != NULL) *eon = 0;
-	XPUSHs(sv_2mortal(newSVpvf("%s:%s", pkg->info, s+1)));
-	if (eon != NULL) *eon = '@';
-	if (eos != NULL) *eos = '.';
-      } else {
-	XPUSHs(sv_2mortal(newSVpv(pkg->info, eon-pkg->info)));
-      }
+      XPUSHs(sv_2mortal(newSVpv(pkg->info, eon-pkg->info)));
     }
   } else if (pkg->h) {
     char buff[1024];
@@ -2004,16 +1977,8 @@ Pkg_header_filename(pkg)
     char *version = get_name(pkg->h, RPMTAG_VERSION);
     char *release = get_name(pkg->h, RPMTAG_RELEASE);
     char *arch = headerIsEntry(pkg->h, RPMTAG_SOURCERPM) ? get_name(pkg->h, RPMTAG_ARCH) : "src";
-    char *filename = get_name(pkg->h, FILENAME_TAG);
 
-    p += snprintf(buff, sizeof(buff), "%s-%s-%s.%s:", name, version, release, arch);
-    if (filename) snprintf(p, sizeof(buff) - (p-buff), "%s-%s-%s.%s.rpm", name, version, release, arch);
-    if (!filename || !strcmp(p, filename)) {
-      *--p = 0;
-    } else {
-      p += snprintf(p, sizeof(buff) - (p-buff), "%s", filename);
-      *(p -= 4) = 0; /* avoid .rpm */
-    }
+    p += snprintf(buff, sizeof(buff), "%s-%s-%s.%s", name, version, release, arch);
     XPUSHs(sv_2mortal(newSVpv(buff, p-buff)));
   }
 
diff --git a/URPM/Build.pm b/URPM/Build.pm
index f5a3aff..78942b9 100644
--- a/URPM/Build.pm
+++ b/URPM/Build.pm
@@ -18,6 +18,8 @@ sub _get_tmp_dir () {
 #-   callback : perl code to be called for each package read (defaults pack_header)
 #-   clean    : bool to clean cache before (default no).
 #-   packing  : bool to create info (default is weird)
+#
+# deprecated
 sub parse_rpms_build_headers {
     my ($urpm, %options) = @_;
     my ($dir, %cache, @headers);
@@ -402,6 +404,8 @@ sub compute_deps {
 #-   idlist   : id list of rpm to compute (defaults is start .. end)
 #-   ratio    : compression ratio (default 4).
 #-   split    : split ratio (default 400kb, see MDV::Packdrakeng).
+#
+# deprecated
 sub build_hdlist {
     my ($urpm, %options) = @_;
     my ($dir, $ratio, @idlist);