pbrobinson pushed to aeskulap (f22). "minor fixes"

[notifications at fedoraproject.org]

>From dc324895ed2dabdb72f6f3603ea14d414c94c70b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Tue, 21 Apr 2015 11:31:43 +0100
Subject: minor fixes


diff --git a/aeskulap-oflog.patch b/aeskulap-oflog.patch
index c7b3057..95acfe8 100644
--- a/aeskulap-oflog.patch
+++ b/aeskulap-oflog.patch
@@ -1,16 +1,3 @@
-Index: aeskulap-0.2.2b1/configure
-===================================================================
---- aeskulap-0.2.2b1.orig/configure	2011-02-14 13:39:50.000000000 +0100
-+++ aeskulap-0.2.2b1/configure	2011-02-14 13:38:39.000000000 +0100
-@@ -24361,7 +24361,7 @@
- 
- 
- DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
--DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
-+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -loflog -lwrap"
- 
- if test "x${prefix}" = "xNONE"; then
-     packageprefix=${ac_default_prefix}
 Index: aeskulap-0.2.2b1/configure.in
 ===================================================================
 --- aeskulap-0.2.2b1.orig/configure.in	2011-02-14 13:39:50.000000000 +0100
diff --git a/aeskulap.spec b/aeskulap.spec
index f65ff56..bb69079 100644
--- a/aeskulap.spec
+++ b/aeskulap.spec
@@ -4,7 +4,7 @@
 # Schemas handling also needs to be looked at.
 Name:           aeskulap
 Version:        0.2.2
-Release:        0.21beta1%{?dist}
+Release:        0.22beta1%{?dist}
 Summary:        A full open source replacement for commercially available DICOM viewers
 
 License:        LGPLv2+
@@ -57,9 +57,6 @@ were these packages are available.
 # configure.in patch
 %patch7 -p1
 # otherwise it fails
-touch ./NEWS
-autoreconf -if
-
 # apply patches
 %patch0 -p1
 %patch2 -p1
@@ -76,15 +73,18 @@ rm -rvf dcmtk
 # remove header : Debian used a patch for this
 sed -ri "/dcmtk\/dcmdata\/dcdebug\.h/d" ./imagepool/poolfindassociation.cpp ./imagepool/poolmoveassociation.cpp
 
+touch ./NEWS
+autoreconf -vif
+
 %build
 # point her to the correct lib version depending on the arch
 sed -i 's/lib -ldcmjpeg/%{_lib}\/dcmtk -ldcmjpeg/' configure configure.in
 
 %configure --disable-static --disable-schemas-install
-make %{?_smp_mflags}
+make
+# make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -148,7 +148,6 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
 %{_datadir}/%{name}/
@@ -160,6 +159,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc AUTHORS ABOUT-NLS ChangeLog COPYING README %{name}-tutorials.pdf
 
 %changelog
+* Tue Apr 21 2015 Peter Robinson <pbrobinson at fedoraproject.org> 0.2.2-0.22beta1
+- Minor fixes
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 0.2.2-0.21beta1
 - Add an AppData file for the software center
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/aeskulap.git/commit/?h=f22&id=dc324895ed2dabdb72f6f3603ea14d414c94c70b