From e82c7c7d34c56017122146d3766554f9690c1f7b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 19 Aug 2011 18:48:56 +0200 Subject: [PATCH] - Rebase ld patch --- quazip-0.4.1-ld.patch | 48 ------------------------------------------- quazip-0.4.2-ld.patch | 48 +++++++++++++++++++++++++++++++++++++++++++ quazip.spec | 3 ++- sources | 2 +- 4 files changed, 51 insertions(+), 50 deletions(-) delete mode 100644 quazip-0.4.1-ld.patch create mode 100644 quazip-0.4.2-ld.patch diff --git a/quazip-0.4.1-ld.patch b/quazip-0.4.1-ld.patch deleted file mode 100644 index a59e2ee..0000000 --- a/quazip-0.4.1-ld.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up quazip-0.4.1/test/checksum/checksum.pro.ld quazip-0.4.1/test/checksum/checksum.pro ---- quazip-0.4.1/test/checksum/checksum.pro.ld 2011-07-25 14:29:04.022774007 +0200 -+++ quazip-0.4.1/test/checksum/checksum.pro 2011-07-25 14:28:42.555773994 +0200 -@@ -8,7 +8,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.1/test/jlcompress/jlcompress.pro.ld quazip-0.4.1/test/jlcompress/jlcompress.pro ---- quazip-0.4.1/test/jlcompress/jlcompress.pro.ld 2011-03-06 05:41:55.000000000 +0100 -+++ quazip-0.4.1/test/jlcompress/jlcompress.pro 2011-07-25 14:29:29.444774008 +0200 -@@ -8,7 +8,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.1/test/unzip/unzip.pro.ld quazip-0.4.1/test/unzip/unzip.pro ---- quazip-0.4.1/test/unzip/unzip.pro.ld 2011-07-25 14:28:21.582774005 +0200 -+++ quazip-0.4.1/test/unzip/unzip.pro 2011-07-25 14:28:29.410774007 +0200 -@@ -5,7 +5,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp -diff -up quazip-0.4.1/test/zip/zip.pro.ld quazip-0.4.1/test/zip/zip.pro ---- quazip-0.4.1/test/zip/zip.pro.ld 2011-05-14 18:48:01.000000000 +0200 -+++ quazip-0.4.1/test/zip/zip.pro 2011-07-25 14:29:46.963774006 +0200 -@@ -5,7 +5,7 @@ QT -= gui - DEPENDPATH += . - INCLUDEPATH += . ../../ - --LIBS += -L../../bin -lquazip -+LIBS += -L../../quazip -lquazip -lminizip - - # Input - SOURCES += main.cpp diff --git a/quazip-0.4.2-ld.patch b/quazip-0.4.2-ld.patch new file mode 100644 index 0000000..91e2bcb --- /dev/null +++ b/quazip-0.4.2-ld.patch @@ -0,0 +1,48 @@ +diff -up quazip-0.4.2/test/checksum/checksum.pro.ld quazip-0.4.2/test/checksum/checksum.pro +--- quazip-0.4.2/test/checksum/checksum.pro.ld 2011-03-06 05:41:55.000000000 +0100 ++++ quazip-0.4.2/test/checksum/checksum.pro 2011-08-19 18:42:08.914907703 +0200 +@@ -8,7 +8,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.2/test/jlcompress/jlcompress.pro.ld quazip-0.4.2/test/jlcompress/jlcompress.pro +--- quazip-0.4.2/test/jlcompress/jlcompress.pro.ld 2011-03-06 05:41:55.000000000 +0100 ++++ quazip-0.4.2/test/jlcompress/jlcompress.pro 2011-08-19 18:42:08.915907841 +0200 +@@ -8,7 +8,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.2/test/unzip/unzip.pro.ld quazip-0.4.2/test/unzip/unzip.pro +--- quazip-0.4.2/test/unzip/unzip.pro.ld 2011-05-14 18:48:01.000000000 +0200 ++++ quazip-0.4.2/test/unzip/unzip.pro 2011-08-19 18:46:26.937001113 +0200 +@@ -5,7 +5,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp +diff -up quazip-0.4.2/test/zip/zip.pro.ld quazip-0.4.2/test/zip/zip.pro +--- quazip-0.4.2/test/zip/zip.pro.ld 2011-05-14 18:48:01.000000000 +0200 ++++ quazip-0.4.2/test/zip/zip.pro 2011-08-19 18:46:38.997643584 +0200 +@@ -5,7 +5,7 @@ QT -= gui + DEPENDPATH += . + INCLUDEPATH += . ../../ + +-LIBS += -L../../bin -lquazip ++LIBS += -L../../quazip -lquazip -lminizip + + # Input + SOURCES += main.cpp diff --git a/quazip.spec b/quazip.spec index e3498ff..200e612 100644 --- a/quazip.spec +++ b/quazip.spec @@ -6,7 +6,7 @@ License: GPLv2+ or LGPLv2+ Group: System Environment/Libraries URL: http://quazip.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: quazip-0.4.1-ld.patch +Patch0: quazip-0.4.2-ld.patch BuildRequires: qt4-devel BuildRequires: minizip-devel BuildRequires: doxygen graphviz @@ -78,6 +78,7 @@ rm -rf %{buildroot} %changelog * Fri Aug 19 2011 Nicolas Chauvet - 0.4.2-1 - Update to 0.4.2 +- Rebase ld patch * Mon Jul 25 2011 Nicolas Chauvet - 0.4.1-1 - Update to 0.4.1 diff --git a/sources b/sources index 4a236ec..6444561 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0a4d60331fc7ff9f7446145c2ffd1c0 quazip-0.4.2.tar.gz +d48d18c08ff5fe87cde0597adb7835de quazip-0.4.2.tar.gz