Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

6 files changed, 8 insertions, 7 deletions

diff --git a/libre/openexr/InterpretingDeepPixels.docx b/libre/openexr/InterpretingDeepPixels.docx
new file mode 100644
index 000000000..03d6fcdb0
--- /dev/null
+++ b/libre/openexr/InterpretingDeepPixels.docx
diff --git a/libre/openexr/MultiViewOpenEXR.odt b/libre/openexr/MultiViewOpenEXR.odt
new file mode 100644
index 000000000..ace41168b
--- /dev/null
+++ b/libre/openexr/MultiViewOpenEXR.odt
diff --git a/libre/openexr/OpenEXRFileLayout.odt b/libre/openexr/OpenEXRFileLayout.odt
new file mode 100644
index 000000000..cc969b551
--- /dev/null
+++ b/libre/openexr/OpenEXRFileLayout.odt
diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD
index a2a2ba472..2eb99b439 100644
--- a/libre/openexr/PKGBUILD
+++ b/libre/openexr/PKGBUILD
@@ -3,6 +3,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=openexr
+_pkgname=$pkgname
 pkgver=2.1.0
 pkgrel=1.parabola1
 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation"
@@ -11,15 +12,15 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
 makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama')
-replaces=("$pkgname-libre")
-conflicts=("$pkgname-libre")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
 mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt"
           "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt")
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
 noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt)
 
 mksource() {
@@ -43,19 +44,19 @@ prepare() {
   # remove TheoryDeepPixels.pdf reference
   sed -i '\|TheoryDeepPixels[.]pdf|d
           \|InterpretingDeepPixels[.]pdf| s| [\]||
-         ' "${srcdir}/${pkgname}-${pkgver}/doc/Makefile."{am,in}
+         ' "${srcdir}/${_pkgname}-${pkgver}/doc/Makefile."{am,in}
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
   install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}"
 }
 mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43'
diff --git a/libre/openexr/ReadingAndWritingImageFiles.odt b/libre/openexr/ReadingAndWritingImageFiles.odt
new file mode 100644
index 000000000..d8c1fd44a
--- /dev/null
+++ b/libre/openexr/ReadingAndWritingImageFiles.odt
diff --git a/libre/openexr/TechnicalIntroduction.odt b/libre/openexr/TechnicalIntroduction.odt
new file mode 100644
index 000000000..d728128cc
--- /dev/null
+++ b/libre/openexr/TechnicalIntroduction.odt