From 1a541ff77232f348a2fb4a04827ee0082e7038ee Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 11:58:38 +0000 Subject: [PATCH 01/22] Initialize branch F-9 for aimage --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From c8487f0127bdf62897b7d0c04655eb1475db5275 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 4 Sep 2008 18:12:20 +0000 Subject: [PATCH 02/22] - Update to 3.1.2 --- .cvsignore | 2 +- aimage.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2754097..7d7d13a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aimage-3.1.0.tar.gz +aimage-3.1.2.tar.gz diff --git a/aimage.spec b/aimage.spec index ae12fa4..757a8a0 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,5 +1,5 @@ Name: aimage -Version: 3.1.0 +Version: 3.1.2 Release: 1%{?dist} Summary: Advanced Disk Imager @@ -42,5 +42,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.1.2-1 +- Update to 3.1.2 + * Wed Mar 12 2008 kwizart < kwizart at gmail.com > - 3.1.0-1 - Initial spec file diff --git a/sources b/sources index f6ab06a..117c084 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9fa654161a76f817f5f3dd1e2b74984 aimage-3.1.0.tar.gz +5e9ac74251977832d05da74683698a31 aimage-3.1.2.tar.gz From 9e737f62fd272d1cb58c475b43897fc3e439ad55 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 23 Sep 2008 14:40:21 +0000 Subject: [PATCH 03/22] - Update to 3.2.0 --- .cvsignore | 2 +- aimage.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7d7d13a..9ed3b53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aimage-3.1.2.tar.gz +aimage-3.2.0.tar.gz diff --git a/aimage.spec b/aimage.spec index 757a8a0..5bf2405 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,5 +1,5 @@ Name: aimage -Version: 3.1.2 +Version: 3.2.0 Release: 1%{?dist} Summary: Advanced Disk Imager @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.2.0-1 +- Update to 3.2.0 + * Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.1.2-1 - Update to 3.1.2 diff --git a/sources b/sources index 117c084..6b7d77c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e9ac74251977832d05da74683698a31 aimage-3.1.2.tar.gz +58218cfc5cfcfdbabb216f1f8c0f9c39 aimage-3.2.0.tar.gz From ff497708145edb4337dca5c4082969e98c6f0e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Thu, 15 Jan 2009 11:33:32 +0000 Subject: [PATCH 04/22] - rebuild with new openssl --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index 5bf2405..2f97edd 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 15 2009 Tomas Mraz - 3.2.0-2 +- rebuild with new openssl + * Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.2.0-1 - Update to 3.2.0 From 6104ca72f28c6d119cfb5af5125e68a611c3e50f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:22:04 +0000 Subject: [PATCH 05/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index 2f97edd..0dc7643 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 3.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jan 15 2009 Tomas Mraz - 3.2.0-2 - rebuild with new openssl From 9fb24e376c32b03fcd7c2511f6ebbf42e3c6003b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 2 Mar 2009 12:46:37 +0000 Subject: [PATCH 06/22] Fix for gcc44 --- aimage-3.2.0-gcc44.patch | 21 +++++++++++++++++++++ aimage.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 aimage-3.2.0-gcc44.patch diff --git a/aimage-3.2.0-gcc44.patch b/aimage-3.2.0-gcc44.patch new file mode 100644 index 0000000..76434a7 --- /dev/null +++ b/aimage-3.2.0-gcc44.patch @@ -0,0 +1,21 @@ +diff -up aimage-3.2.0/src/aimage_os.cpp.gcc44 aimage-3.2.0/src/aimage_os.cpp +--- aimage-3.2.0/src/aimage_os.cpp.gcc44 2009-03-02 13:36:09.000000000 +0100 ++++ aimage-3.2.0/src/aimage_os.cpp 2009-03-02 13:41:32.000000000 +0100 +@@ -33,11 +33,15 @@ void checkline(const char *name,const ch + { + while(buf[0] && isspace(buf[0])) buf++; // advance buf to end of spaces + +- char *pos = strstr(buf,name); ++ char *buf_tmp; ++ char *name_tmp; ++ strcpy(buf_tmp, buf); ++ strcpy(name_tmp, name); ++ char *pos = strstr(buf_tmp,name_tmp); + if(pos==0) return; + + /* The string was found */ +- char *cc = pos + strlen(name); // skip past to the end of the string ++ char *cc = pos + strlen(name_tmp); // skip past to the end of the string + while(*cc && isspace(*cc)) cc++; // scan to end of spaces + char *dd = index(cc,'\n'); // can we find a \n? + if(dd) *dd = '\000'; // yes; clear it diff --git a/aimage.spec b/aimage.spec index 0dc7643..07e752e 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,12 +1,13 @@ Name: aimage Version: 3.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Advanced Disk Imager Group: Applications/System License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz +Patch0: aimage-3.2.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: afflib-devel @@ -19,6 +20,7 @@ Advanced Disk Imager. %prep %setup -q +%patch0 -p1 -b .gcc44 %build @@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.2.0-4 +- Fix for gcc44 + * Mon Feb 23 2009 Fedora Release Engineering - 3.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From bcb96d82522b922d3833c80f14433e812bd05aeb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:39:46 +0000 Subject: [PATCH 07/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index 07e752e..84ffad5 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.2.0-4 - Fix for gcc44 From 2dab731ac3176336d1260cbe8c62c6cffc4ce710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Fri, 21 Aug 2009 12:20:09 +0000 Subject: [PATCH 08/22] - rebuilt with new openssl --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index 84ffad5..8f6a44e 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Aug 21 2009 Tomas Mraz - 3.2.0-6 +- rebuilt with new openssl + * Fri Jul 24 2009 Fedora Release Engineering - 3.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 570735b342adf3ca09c98a6d41f522fca519a96a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 2 Sep 2009 10:11:24 +0000 Subject: [PATCH 09/22] Update to 3.2.1 --- .cvsignore | 2 +- aimage-3.2.0-gcc44.patch | 21 --------------------- aimage-3.2.1.gcc44.patch | 12 ++++++++++++ aimage.spec | 12 ++++++++---- sources | 2 +- 5 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 aimage-3.2.0-gcc44.patch create mode 100644 aimage-3.2.1.gcc44.patch diff --git a/.cvsignore b/.cvsignore index 9ed3b53..e7209f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aimage-3.2.0.tar.gz +aimage-3.2.1.tar.gz diff --git a/aimage-3.2.0-gcc44.patch b/aimage-3.2.0-gcc44.patch deleted file mode 100644 index 76434a7..0000000 --- a/aimage-3.2.0-gcc44.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up aimage-3.2.0/src/aimage_os.cpp.gcc44 aimage-3.2.0/src/aimage_os.cpp ---- aimage-3.2.0/src/aimage_os.cpp.gcc44 2009-03-02 13:36:09.000000000 +0100 -+++ aimage-3.2.0/src/aimage_os.cpp 2009-03-02 13:41:32.000000000 +0100 -@@ -33,11 +33,15 @@ void checkline(const char *name,const ch - { - while(buf[0] && isspace(buf[0])) buf++; // advance buf to end of spaces - -- char *pos = strstr(buf,name); -+ char *buf_tmp; -+ char *name_tmp; -+ strcpy(buf_tmp, buf); -+ strcpy(name_tmp, name); -+ char *pos = strstr(buf_tmp,name_tmp); - if(pos==0) return; - - /* The string was found */ -- char *cc = pos + strlen(name); // skip past to the end of the string -+ char *cc = pos + strlen(name_tmp); // skip past to the end of the string - while(*cc && isspace(*cc)) cc++; // scan to end of spaces - char *dd = index(cc,'\n'); // can we find a \n? - if(dd) *dd = '\000'; // yes; clear it diff --git a/aimage-3.2.1.gcc44.patch b/aimage-3.2.1.gcc44.patch new file mode 100644 index 0000000..be7270d --- /dev/null +++ b/aimage-3.2.1.gcc44.patch @@ -0,0 +1,12 @@ +diff -up aimage-3.2.1/src/ident.cpp.gcc44 aimage-3.2.1/src/ident.cpp +--- aimage-3.2.1/src/ident.cpp.gcc44 2009-09-02 11:54:51.199071082 +0200 ++++ aimage-3.2.1/src/ident.cpp 2009-09-02 11:56:43.164073238 +0200 +@@ -126,7 +126,7 @@ char *getfileline(const char *dirname,co + */ + void getresult(const char *buf,const char *str,char **res) + { +- char *pos = strstr(buf,str); ++ const char *pos = strstr(buf,str); + if(!pos) return; + pos += strlen(str); + *res = strdup(pos); diff --git a/aimage.spec b/aimage.spec index 8f6a44e..00572bb 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,16 +1,16 @@ Name: aimage -Version: 3.2.0 -Release: 6%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Advanced Disk Imager Group: Applications/System License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz -Patch0: aimage-3.2.0-gcc44.patch +Patch0: aimage-3.2.1.gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: afflib-devel +BuildRequires: afflib-devel >= 3.3.7 BuildRequires: expat-devel BuildRequires: openssl-devel @@ -44,6 +44,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 2 2009 kwizart < kwizart at gmail.com > - 3.2.1-1 +- Update to 3.2.1 +- Update gcc44 patch + * Fri Aug 21 2009 Tomas Mraz - 3.2.0-6 - rebuilt with new openssl diff --git a/sources b/sources index 6b7d77c..8ec1405 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58218cfc5cfcfdbabb216f1f8c0f9c39 aimage-3.2.0.tar.gz +0afd3376fe2c8dd8e43571282505a9fb aimage-3.2.1.tar.gz From 75fc7e294e0fe8f3d67d00c0018bdacd6759ed76 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 22 Nov 2009 20:44:12 +0000 Subject: [PATCH 10/22] Update to 3.2.3 --- .cvsignore | 2 +- aimage-3.2.1.gcc44.patch | 12 ------------ aimage.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 aimage-3.2.1.gcc44.patch diff --git a/.cvsignore b/.cvsignore index e7209f7..d054aca 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aimage-3.2.1.tar.gz +aimage-3.2.3.tar.gz diff --git a/aimage-3.2.1.gcc44.patch b/aimage-3.2.1.gcc44.patch deleted file mode 100644 index be7270d..0000000 --- a/aimage-3.2.1.gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up aimage-3.2.1/src/ident.cpp.gcc44 aimage-3.2.1/src/ident.cpp ---- aimage-3.2.1/src/ident.cpp.gcc44 2009-09-02 11:54:51.199071082 +0200 -+++ aimage-3.2.1/src/ident.cpp 2009-09-02 11:56:43.164073238 +0200 -@@ -126,7 +126,7 @@ char *getfileline(const char *dirname,co - */ - void getresult(const char *buf,const char *str,char **res) - { -- char *pos = strstr(buf,str); -+ const char *pos = strstr(buf,str); - if(!pos) return; - pos += strlen(str); - *res = strdup(pos); diff --git a/aimage.spec b/aimage.spec index 00572bb..fd56327 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,5 +1,5 @@ Name: aimage -Version: 3.2.1 +Version: 3.2.3 Release: 1%{?dist} Summary: Advanced Disk Imager @@ -7,7 +7,6 @@ Group: Applications/System License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz -Patch0: aimage-3.2.1.gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: afflib-devel >= 3.3.7 @@ -20,7 +19,6 @@ Advanced Disk Imager. %prep %setup -q -%patch0 -p1 -b .gcc44 %build @@ -44,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 22 2009 Nicolas Chauvet - 3.2.3-1 +- Update to 3.2.3 +- Remove upstreamed patch + * Wed Sep 2 2009 kwizart < kwizart at gmail.com > - 3.2.1-1 - Update to 3.2.1 - Update gcc44 patch diff --git a/sources b/sources index 8ec1405..f1e6046 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0afd3376fe2c8dd8e43571282505a9fb aimage-3.2.1.tar.gz +ce0e20d509c39169a3587319e93f1f0c aimage-3.2.3.tar.gz From fd5c78b35aea7d510661de5f49787dddc299078c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:50 +0000 Subject: [PATCH 11/22] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3296fb6..b926a94 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: aimage -# $Id$ +# $Id: Makefile,v 1.1 2008/03/23 01:14:39 kevin Exp $ NAME := aimage SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8b1858fbe739fb0d7cdb1ccfc50c5937e388eb42 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:44 +0000 Subject: [PATCH 12/22] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3296fb6..b0c842f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := aimage SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ffb137ce16ed34a68603a3f400b3b435452b648d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 27 Nov 2009 17:09:37 +0000 Subject: [PATCH 13/22] Update to 3.2.4 --- .cvsignore | 2 +- aimage.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d054aca..31d44a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aimage-3.2.3.tar.gz +aimage-3.2.4.tar.gz diff --git a/aimage.spec b/aimage.spec index fd56327..ebb0a90 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,5 +1,5 @@ Name: aimage -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Summary: Advanced Disk Imager @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 27 2009 Nicolas Chauvet - 3.2.4-1 +- Update to 3.2.4 + * Sun Nov 22 2009 Nicolas Chauvet - 3.2.3-1 - Update to 3.2.3 - Remove upstreamed patch diff --git a/sources b/sources index f1e6046..d202bec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce0e20d509c39169a3587319e93f1f0c aimage-3.2.3.tar.gz +bb6e4e91524612570a481b6470fe7cd1 aimage-3.2.4.tar.gz From 1f5077ed32c2132e893493cfdec54a5bb7b2e56f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:39:33 +0000 Subject: [PATCH 14/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b926a94..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aimage -# $Id: Makefile,v 1.1 2008/03/23 01:14:39 kevin Exp $ -NAME := aimage -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d8b7bd527956aa3440bebef31d83c522827d3480 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:39:34 +0000 Subject: [PATCH 15/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b0c842f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aimage -# $Id$ -NAME := aimage -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From 38d18983a41373ab9867d27d9aca846e0d0046fd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:41:46 -0600 Subject: [PATCH 16/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index ebb0a90..3b8fae9 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Nov 27 2009 Nicolas Chauvet - 3.2.4-1 - Update to 3.2.4 From bedc75c47d58a0988397f1cf51b616d3a7a6d33b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:05:56 -0600 Subject: [PATCH 17/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index 3b8fae9..f845aad 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 3.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From d0f2d5e293a476348d530a7b27facae75a63c7bc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Mar 2012 22:43:34 +0100 Subject: [PATCH 18/22] 3.2.5 --- .gitignore | 1 + aimage.spec | 13 +++++-------- sources | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 31d44a8..801827a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ aimage-3.2.4.tar.gz +/aimage-3.2.5.tar.gz diff --git a/aimage.spec b/aimage.spec index f845aad..3602a0d 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,13 +1,12 @@ Name: aimage -Version: 3.2.4 -Release: 3%{?dist} +Version: 3.2.5 +Release: 1%{?dist} Summary: Advanced Disk Imager Group: Applications/System License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: afflib-devel >= 3.3.7 BuildRequires: expat-devel @@ -27,14 +26,9 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%clean -rm -rf $RPM_BUILD_ROOT - - %files %defattr(-,root,root,-) %doc ChangeLog @@ -42,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 26 2012 Peter Robinson - 3.2.5-1 +- Update to 3.2.5 + * Thu Jan 12 2012 Fedora Release Engineering - 3.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index d202bec..934094f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb6e4e91524612570a481b6470fe7cd1 aimage-3.2.4.tar.gz +07a11d653cdd1d7a5aefe4d99cdbd408 aimage-3.2.5.tar.gz From 2eed52d53783835711832a7f14a93ae3c54f291f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:42:17 -0500 Subject: [PATCH 19/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index 3602a0d..d98aca9 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -36,6 +36,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Mar 26 2012 Peter Robinson - 3.2.5-1 - Update to 3.2.5 From 0c8cd3b0f43ef014cef225366425ea5a93183fba Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:23:43 -0600 Subject: [PATCH 20/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index d98aca9..e5d81f6 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -36,6 +36,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 3.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 3.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 739604decc5271c49af836b7ccb16a26a16d4848 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:27:19 -0500 Subject: [PATCH 21/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- aimage.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aimage.spec b/aimage.spec index e5d81f6..bb82acb 100644 --- a/aimage.spec +++ b/aimage.spec @@ -1,6 +1,6 @@ Name: aimage Version: 3.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Advanced Disk Imager Group: Applications/System @@ -36,6 +36,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 3.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 23f235ff1aba2dbcff76fb355d3cff633f1d8e0d Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 4 Jun 2014 19:24:10 +0200 Subject: [PATCH 22/22] 2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. --- .gitignore | 2 -- aimage.spec | 90 ---------------------------------------------------- dead.package | 1 + sources | 1 - 4 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 .gitignore delete mode 100644 aimage.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 801827a..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -aimage-3.2.4.tar.gz -/aimage-3.2.5.tar.gz diff --git a/aimage.spec b/aimage.spec deleted file mode 100644 index bb82acb..0000000 --- a/aimage.spec +++ /dev/null @@ -1,90 +0,0 @@ -Name: aimage -Version: 3.2.5 -Release: 4%{?dist} -Summary: Advanced Disk Imager - -Group: Applications/System -License: BSD with advertising -URL: http://www.afflib.org -Source0: http://www.afflib.org/downloads/aimage-%{version}.tar.gz - -BuildRequires: afflib-devel >= 3.3.7 -BuildRequires: expat-devel -BuildRequires: openssl-devel - -%description -Advanced Disk Imager. - - -%prep -%setup -q - - -%build -%configure --enable-opt -make %{?_smp_mflags} - - -%install -make install DESTDIR=$RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc ChangeLog -%{_bindir}/aimage - - -%changelog -* Sat Aug 03 2013 Fedora Release Engineering - 3.2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 3.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 3.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Mar 26 2012 Peter Robinson - 3.2.5-1 -- Update to 3.2.5 - -* Thu Jan 12 2012 Fedora Release Engineering - 3.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Nov 27 2009 Nicolas Chauvet - 3.2.4-1 -- Update to 3.2.4 - -* Sun Nov 22 2009 Nicolas Chauvet - 3.2.3-1 -- Update to 3.2.3 -- Remove upstreamed patch - -* Wed Sep 2 2009 kwizart < kwizart at gmail.com > - 3.2.1-1 -- Update to 3.2.1 -- Update gcc44 patch - -* Fri Aug 21 2009 Tomas Mraz - 3.2.0-6 -- rebuilt with new openssl - -* Fri Jul 24 2009 Fedora Release Engineering - 3.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Mar 2 2009 kwizart < kwizart at gmail.com > - 3.2.0-4 -- Fix for gcc44 - -* Mon Feb 23 2009 Fedora Release Engineering - 3.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 15 2009 Tomas Mraz - 3.2.0-2 -- rebuild with new openssl - -* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 3.2.0-1 -- Update to 3.2.0 - -* Thu Sep 4 2008 kwizart < kwizart at gmail.com > - 3.1.2-1 -- Update to 3.1.2 - -* Wed Mar 12 2008 kwizart < kwizart at gmail.com > - 3.1.0-1 -- Initial spec file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5784d07 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +2014-06-04 - This package was already retired in pkgdb/blocked in koji, but no dead.package file existed. The original retirement reason is unclear. diff --git a/sources b/sources deleted file mode 100644 index 934094f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -07a11d653cdd1d7a5aefe4d99cdbd408 aimage-3.2.5.tar.gz