Restore patch descriptions

OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=13

librecad-install.diff

@@ -0,0 +1,30 @@
+---
+ librecad/src/src.pro        |    1 -
+ scripts/postprocess-unix.sh |    2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+Index: LibreCAD-2.0.2/librecad/src/src.pro
+===================================================================
+--- LibreCAD-2.0.2.orig/librecad/src/src.pro
++++ LibreCAD-2.0.2/librecad/src/src.pro
+@@ -58,7 +58,6 @@ unix {
+         DEFINES += QC_APPDIR="\"librecad\""
+         DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad"
+         RC_FILE = ../res/main/librecad.icns
+-        QMAKE_POST_LINK = cd $$_PRO_FILE_PWD_/../.. && scripts/postprocess-unix.sh
+     }
+ }
+ win32 {
+Index: LibreCAD-2.0.2/scripts/postprocess-unix.sh
+===================================================================
+--- LibreCAD-2.0.2.orig/scripts/postprocess-unix.sh
++++ LibreCAD-2.0.2/scripts/postprocess-unix.sh
+@@ -3,7 +3,7 @@
+ THISDIR="`pwd`"
+ LCDIR="${THISDIR}/librecad"
+ PIDIR="${THISDIR}/plugins"
+-RESOURCEDIR="${THISDIR}/unix/resources"
++RESOURCEDIR=$BUILDDIR
+ TSDIRLC="${LCDIR}/ts"
+ TSDIRPI="${PIDIR}/ts"
+ SPTDIR="${LCDIR}/support"

librecad-install.patch

@@ -1,23 +0,0 @@
-diff -up LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro.install LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro
---- LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro.install	2013-10-18 01:06:00.805457502 +0100
-+++ LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro	2013-10-18 01:06:00.807457490 +0100
-@@ -57,7 +57,6 @@ unix {
-         DEFINES += QC_APPDIR="\"librecad\""
-         DEFINES += QINITIMAGES_LIBRECAD="qInitImages_librecad"
-         RC_FILE = ../res/main/librecad.icns
--        QMAKE_POST_LINK = cd $$_PRO_FILE_PWD_/../.. && scripts/postprocess-unix.sh
-     }
- }
- win32 {
-diff -up LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/scripts/postprocess-unix.sh.install LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/scripts/postprocess-unix.sh
---- LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/scripts/postprocess-unix.sh.install	2013-10-18 01:06:00.807457490 +0100
-+++ LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/scripts/postprocess-unix.sh	2013-10-18 01:06:38.471238579 +0100
-@@ -3,7 +3,7 @@
- THISDIR="`pwd`"
- LCDIR="${THISDIR}/librecad"
- PIDIR="${THISDIR}/plugins"
--RESOURCEDIR="${THISDIR}/unix/resources"
-+RESOURCEDIR=$BUILDDIR
- TSDIRLC="${LCDIR}/ts"
- TSDIRPI="${PIDIR}/ts"
- SPTDIR="${LCDIR}/support"

librecad-no-date.diff

@@ -1,3 +1,5 @@
+Remove build time references so build-compare can do its work
+
 --- LibreCAD-2.0.2/librecad/src/main/qc_applicationwindow.cpp.orig	2014-01-09 20:31:10.000000000 +0200
 +++ LibreCAD-2.0.2/librecad/src/main/qc_applicationwindow.cpp	2014-04-20 20:09:25.808375807 +0300
 @@ -3851,7 +3851,6 @@

librecad-plugindir.diff

@@ -0,0 +1,25 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2012-05-11 08:16:47.544680812 +0200
+Upstream: depending on whether it is considered an upstream bug or
+	not, it should be sent
+
+Look in the right spot for plugins.
+
+---
+ librecad/src/lib/engine/rs_system.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: LibreCAD-2.0.2/librecad/src/lib/engine/rs_system.cpp
+===================================================================
+--- LibreCAD-2.0.2.orig/librecad/src/lib/engine/rs_system.cpp
++++ LibreCAD-2.0.2/librecad/src/lib/engine/rs_system.cpp
+@@ -642,6 +642,9 @@ QStringList RS_System::getDirectoryList(
+     }
+     RS_SETTINGS->endGroup();
+ 
++	if (subDirectory == "plugins")
++		dirList.append("##LIBDIR##" + appDirName + "/" + subDirectory);
++
+     QStringList ret;
+ 
+     RS_DEBUG->print("RS_System::getDirectoryList: Paths:");

librecad-plugindir.patch

@@ -1,14 +0,0 @@
-diff -U 3 -H -d -r -N -- a/src/lib/engine/rs_system.cpp b/src/lib/engine/rs_system.cpp
---- a/librecad/src/lib/engine/rs_system.cpp	2011-08-14 07:28:00.000000000 +0200
-+++ b/librecad/src/lib/engine/rs_system.cpp	2011-08-15 11:47:16.000000000 +0200
-@@ -530,6 +530,10 @@
-     }
-     RS_SETTINGS->endGroup();
- 
-+    if (subDirectory=="plugins") {
-+        dirList.append("##LIBDIR##" + appDirName + "/" + subDirectory);
-+    }
-+
-     QStringList ret;
- 
-     RS_DEBUG->print("RS_System::getDirectoryList: Paths:");

librecad-use-system-libdxfrw.patch

@@ -1,6 +1,15 @@
-diff -up LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/libraries/libraries.pro.system LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/libraries/libraries.pro
+build: avoid using bundled libdxfrw
---- LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/libraries/libraries.pro.system	2013-08-31 02:29:18.000000000 +0100
+[asterios.dramis@gmail.com: patch imported from Fedora]
-+++ LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/libraries/libraries.pro	2013-10-18 01:04:14.278115312 +0100
+
+---
+ libraries/libraries.pro |    1 -
+ librecad/src/src.pro    |    3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+Index: LibreCAD-2.0.2/libraries/libraries.pro
+===================================================================
+--- LibreCAD-2.0.2.orig/libraries/libraries.pro
++++ LibreCAD-2.0.2/libraries/libraries.pro
 @@ -9,7 +9,6 @@ TEMPLATE = subdirs
  TARGET = libraries
  
@@ -9,10 +18,11 @@ diff -up LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/libraries/libraries.p
          jwwlib
  
  
-diff -up LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro.system LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro
+Index: LibreCAD-2.0.2/librecad/src/src.pro
---- LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro.system	2013-08-31 02:29:18.000000000 +0100
+===================================================================
-+++ LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro	2013-10-18 01:05:25.853666886 +0100
+--- LibreCAD-2.0.2.orig/librecad/src/src.pro
-@@ -36,7 +36,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
++++ LibreCAD-2.0.2/librecad/src/src.pro
+@@ -37,7 +37,6 @@ greaterThan( QT_MAJOR_VERSION, 4 ) {
      CONFIG += help 
  } 
  
@@ -20,7 +30,7 @@ diff -up LibreCAD-f87828ec55def73aaa8c3c3e158fc1abc8171b63/librecad/src/src.pro.
  PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a
  
  DESTDIR = $${INSTALLDIR}
-@@ -76,7 +75,7 @@ LIBS += -L../../generated/lib  \
+@@ -77,7 +76,7 @@ LIBS += -L../../generated/lib  \
      -ljwwlib
  
  DEPENDPATH += \

librecad.changes

@@ -49,9 +49,6 @@ Sun May  4 19:21:39 UTC 2014 - asterios.dramis@gmail.com
 - Removed the following patches (not needed anymore):
   * librecad-dxflib25.diff
   * librecad-external-dxflib.diff
-- Replaced the following patches (with ones taken from Fedora):
-  * librecad-install.diff with librecad-install.patch
-  * librecad-plugindir.diff with librecad-plugindir.patch
 - Added the following patches (taken from Fedora):
   * librecad-use-system-libdxfrw.patch (Use system libdxfrw)
 

librecad.spec

@@ -32,14 +32,10 @@ Url:            http://librecad.org/
 Source0:        LibreCAD-%version.tar.gz
 Source1:        ttf2lff.1
 Source2:        %name-rpmlintrc
-# PATCH-FIX-OPENSUSE librecad-no-date.diff -- Remove build time references so build-compare can do its work
+Patch1:         librecad-no-date.diff
-Patch0:         librecad-no-date.diff
+Patch2:         librecad-use-system-libdxfrw.patch
-# PATCH-FIX-UPSTREAM librecad-use-system-libdxfrw.patch asterios.dramis@gmail.com -- Use system libdxfrw (patch taken from Fedora)
+Patch3:         librecad-install.diff
-Patch1:         librecad-use-system-libdxfrw.patch
+Patch4:         librecad-plugindir.diff
-# PATCH-FIX-OPENSUSE librecad-install.patch -- Fix install (patch taken from Fedora)
-Patch2:         librecad-install.patch
-# PATCH-FIX-OPENSUSE librecad-plugindir.patch -- Look in the right spot for plugins (patch taken from Fedora)
-Patch3:         librecad-plugindir.patch
 BuildRequires:  boost-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -74,10 +70,7 @@ CAD drawings.
 
 %prep
 %setup -qn LibreCAD-%version
-%patch0 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # Fix paths
 sed -i 's|##LIBDIR##|%{_libdir}|g' librecad/src/lib/engine/rs_system.cpp