Changeset 550 in ProjectBuilder for projects/afio/pbconf

Timestamp:

Sep 20, 2008, 1:20:52 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fixes for correct Fedora build according to ​https://bugzilla.redhat.com/show_bug.cgi?id=449037

Location:

projects/afio/pbconf/2.5

Files:

• afio/pbpatch/01-fedora-patches.all (modified) (4 diffs)
• afio/rpm/afio.spec (modified) (3 diffs)
• pbfilter/all.pbf (modified) (1 diff)

projects/afio/pbconf/2.5/afio/pbpatch/01-fedora-patches.all

@@ -7 +7 @@
     else
 -       execlp (compressprog, compressprog, "-d", "-c", 0);
-+       execlp (compressprog, compressprog, "-d", "-c", NULL);
++       execlp (compressprog, compressprog, "-d", "-c", (char *)NULL);
     fprintf (stderr, "Could not uncompress, errno %d\n", errno);
     exit(1);
@@ -16 +16 @@
     
 -        execlp (controlscript, controlscript, label, 0);
-+        execlp (controlscript, controlscript, label, NULL);
++        execlp (controlscript, controlscript, label, (char *)NULL);
  
     warnarch("Problems running control script:",(off_t)0);         
@@ -25 +25 @@
           else
 -             execlp (compressprog, compressprog, "-d", "-c", 0);
-+             execlp (compressprog, compressprog, "-d", "-c", NULL);
++             execlp (compressprog, compressprog, "-d", "-c", (char *)NULL);
           fprintf (stderr, "Could not uncompress, errno %d\n", errno);
           exit (1);
@@ -43 +43 @@
  
  /*
+diff -urNp afio-2.5.orig/compfile.c afio-2.5/compfile.c
+--- afio-2.5.orig/compfile.c    2008-09-20 00:36:18.000000000 +0200
++++ afio-2.5/compfile.c 2008-09-20 00:36:49.000000000 +0200
+@@ -179,7 +179,7 @@ int setupgzip(char *name)
+       if (open (name, O_RDONLY) >= 0)
+       { 
+      if(! compressargs)
+-         execlp (compressprog, compressprog, "-c", farg, 0);
++         execlp (compressprog, compressprog, "-c", farg, (char *)NULL);
+      else
+          execvp (compressprog, compress_arg_list);
+       }

projects/afio/pbconf/2.5/afio/rpm/afio.spec

@@ -13 +13 @@
 Url:            PBURL
 Source:         PBREPO/PBSRC
+PBPATCHSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
@@ -28 +29 @@
 %setup -q
 
+PBPATCHCMD
+
 %build
 make %{?_smp_mflags}
+chmod 644 script*/*
+
+%check
+make regtest
+make regtest2gb
 
 %install
@@ -35 +43 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 755 afio $RPM_BUILD_ROOT%{_bindir}
-install -m 644 afio.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 755 afio $RPM_BUILD_ROOT%{_bindir}
+install -p -m 644 afio.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean

projects/afio/pbconf/2.5/pbfilter/all.pbf

@@ -38 +38 @@
 filter PBURL = http://freshmeat.net/redir/afio/144/url_tgz/afio-2.5.tgz
 
+# License
 filter PBLIC = LGPL
+
+# Patch management
+# PBPATCHSRC is replaced by the patches names if value is yes
+filter PBPATCHSRC = yes
+# PBPATCHCMD is replaced by the patches commands if value is yes
+filter PBPATCHCMD = yes