Unretire for F22, F23 and rawhide.

New upstram url, packaging fixes, bug-fix.
2015-05-11: Retired because of broken deps in preparation of Fedora 22
2015-12-01 23:16:20 +01:00 · 2015-05-11 22:20:02 +02:00
12 changed files with 87 additions and 1382 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-/aeskulap-0.2.2-beta1.tar.gz
-/aeskulap-tutorials.pdf
+/jenslody-aeskulap-e467dfd.tar.gz
--- a/aeskulap-DcmElement.patch
+++ b/aeskulap-DcmElement.patch
@ -1,20 +0,0 @@
-The original API change happen on:
-http://git.dcmtk.org/web?p=dcmtk.git;a=commit;h=7e87c88918a0ac1f682116cbf0c3205487bb9086
-
-According to DCMTK team:
-In the long term, we are trying to get rid of the member variable "errorFlag" in the dcmdata module. All methods should return an OFCondition instead of setting an internal variable for this purpose.
-Index: aeskulap-0.2.2b1/imagepool/poolassociation.h
-===================================================================
--- aeskulap-0.2.2b1.orig/imagepool/poolassociation.h	2011-02-14 11:00:36.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/poolassociation.h	2011-02-14 11:00:52.000000000 +0100
-@@ -115,9 +115,7 @@
- 
- 		if(value != NULL) {
- 			if (strlen(value) > 0) {
-				elem->putString(value);
-
-				if (elem->error() != EC_Normal) {
-+				if( elem->putString(value) != EC_Normal) {
- 					printf("cannot put tag value: (%04x,%04x)=\"%s\"", g, e, value);
- 					return false;
- 				}
--- a/aeskulap-circular-svg.patch
+++ b/aeskulap-circular-svg.patch
--- a/aeskulap-configure.patch
+++ b/aeskulap-configure.patch
@ -1,125 +0,0 @@
-diff -ubrN aeskulap-0.2.2-beta1.orig/configure.in aeskulap-0.2.2-beta1/configure.in
--- aeskulap-0.2.2-beta1.orig/configure.in	2007-05-24 20:59:09.000000000 +0200
-+++ aeskulap-0.2.2-beta1/configure.in	2007-11-12 23:03:37.000000000 +0100
-@@ -30,7 +30,6 @@
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_INSTALL
-
- if test x"$MINGW32" = xno ; then
- AM_BINRELOC
- else
-@@ -80,6 +79,7 @@
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
- 
-+
- if test x"$MINGW32" = xno ; then
- 
- PKG_CHECK_MODULES(GCONFMM, gconfmm-2.6 >= 2.10.0)
-@@ -95,32 +95,16 @@
- fi
- 
- 
-dnl AC_CONFIG_SUBDIRS(dcmtk)
-
-if test x"$MINGW32" = xyes ; then
-
-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
-DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwsock32"
-
-else
-
-DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
-AC_SUBST(DCMJPEG_LIBS)
-
-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
-DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
--L../dcmtk/dcmdata/libsrc \
--L../dcmtk/dcmnet/libsrc \
--L../dcmtk/dcmjpeg/libsrc \
--L../dcmtk/dcmimage/libsrc \
--L../dcmtk/dcmimgle/libsrc \
-\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
-
-fi
-+dnl use Debian packages dcmtk
-+dnl AC_CHECK_LIB(dcmimage)
-+AC_CHECK_HEADER(dcmtk/config/osconfig.h)
- 
- AC_SUBST(DCMTK_CFLAGS)
- AC_SUBST(DCMTK_LIBS)
- 
-+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
-+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
-+
- dnl set PREFIX
- if test "x${prefix}" = "xNONE"; then
-     packageprefix=${ac_default_prefix}
-@@ -128,16 +112,13 @@
-     packageprefix=${prefix}
- fi
- 
-DCMTK_SUBDIR=""
- if test x"$MINGW32" = xno ; then
-DCMTK_SUBDIR="dcmtk"
- LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
- else
- LDFLAGS_MINGW32="-mwindows"
- LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
- fi
- 
-AC_SUBST(DCMTK_SUBDIR)
- AC_SUBST(LDFLAGS_MINGW32)
- AC_SUBST(LDFLAGS_AESKULAP_LIBS)
- 
-@@ -160,12 +141,3 @@
- packaging/win32/aeskulap.iss
- ])
- 
-
-if test x"$MINGW32" = xno ; then
-
-cd $srcdir/dcmtk
-export CFLAGS="$CFLAGS"
-export CXXFLAGS="$CXXFLAGS"
-sh ./configure --without-openssl --without-zlib --without-libwrap --prefix=${prefix} --libdir=${prefix}/lib/aeskulap
-
-fi
-diff -ubrN aeskulap-0.2.2-beta1.orig/Makefile.am aeskulap-0.2.2-beta1/Makefile.am
--- aeskulap-0.2.2-beta1.orig/Makefile.am	2007-05-24 21:19:55.000000000 +0200
-+++ aeskulap-0.2.2-beta1/Makefile.am	2007-11-07 07:23:00.000000000 +0100
-@@ -1,6 +1,5 @@
- SUBDIRS = \
- 	po \
-	$(DCMTK_SUBDIR) \
- 	configuration \
- 	imagepool \
- 	widgets \
-@@ -21,7 +20,6 @@
- 	AUTHORS \
- 	COPYING \
- 	COPYING.LIB \
-	COPYING.DCMTK \
- 	INSTALL \
- 	README \
- 	aeskulap.cbp \
-@@ -39,18 +37,7 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
-dist-hook:
-	mkdir -p $(distdir)/dcmtk
-	cp -Rf $(top_srcdir)/dcmtk/* $(distdir)/dcmtk
-	cd $(distdir)/dcmtk && make distclean
-	list=`find $(distdir)/dcmtk -name "CVS"` && rm -Rf $$list
-	list=`find $(distdir)/dcmtk -name ".cvsignore"` && rm -f $$list
-	list=`find $(distdir)/dcmtk -name ".#*"` && rm -f $$list
-	list=`find $(distdir)/dcmtk -name "*.a"` && rm -f $$list
-	list=`find $(distdir)/dcmtk -name "*.so"` && rm -f $$list
-
- distclean: distclean-recursive
-	if test x"" != "x" ; then cd ./dcmtk && make distclean ; fi
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -f Makefile
- 
--- a/aeskulap-desktop.patch
+++ b/aeskulap-desktop.patch
@ -1,16 +0,0 @@
--- src/aeskulap.desktop	2013-03-14 09:42:43.582764423 +1100
-+++ ../aeskulap-0.2.2-beta1/src/aeskulap.desktop	2013-03-14 09:43:32.381558039 +1100
-@@ -1,11 +1,10 @@
- [Desktop Entry]
-Encoding=UTF-8
- Name=Aeskulap Viewer
- Comment=Medical image viewer and DICOM network client
- Exec=aeskulap
- Icon=aeskulap
- Terminal=false
- Type=Application
-Categories=Application;Graphics;
-+Categories=Viewer;MedicalSoftware;Graphics;
- StartupNotify=true
-MimeType=image/dicom
-+MimeType=application/dicom;
--- a/aeskulap-findAndCopyElement.patch
+++ b/aeskulap-findAndCopyElement.patch
@ -1,69 +0,0 @@
-This change is related to:
-
-http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=1d751592ff858b1dcb0f82647c06de779b8e7c32
-
-It allows compilation against DCMTK 3.6.0
-Index: aeskulap-0.2.2b1/imagepool/dicomdir.cpp
-===================================================================
--- aeskulap-0.2.2b1.orig/imagepool/dicomdir.cpp	2011-02-14 10:27:07.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/dicomdir.cpp	2011-02-14 10:27:10.000000000 +0100
-@@ -151,21 +151,21 @@
-             DcmDataset study;
-             DcmElement *el;
- 
-            if ( studyRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyInstanceUID, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyDate, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyTime, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( patRec->findAndCopyElement(DCM_PatientsName, el) == ECC_Normal )
-+            if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( patRec->findAndCopyElement(DCM_PatientsBirthDate, el) == ECC_Normal )
-+            if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-            if ( patRec->findAndCopyElement(DCM_PatientsSex, el) == ECC_Normal )
-+            if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
-                 study.insert(el);
-             resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
-         }
-@@ -221,21 +221,21 @@
-             DcmDataset series;
-             DcmElement *el;
- 
-            if ( seriesRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesDescription, el) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesInstanceUID, el) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_Modality, el) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesDate, el) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesTime, el) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StationName, el) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
-                 series.insert(el);
- 
-             // Count Related SOP Instances
--- a/aeskulap-gcc.patch
+++ b/aeskulap-gcc.patch
@ -1,10 +0,0 @@
--- aeskulap-0.2.2-beta1.orig/configuration/aconfiguration-gconf.cpp
-+++ aeskulap-0.2.2-beta1/configuration/aconfiguration-gconf.cpp
-@@ -27,6 +27,7 @@
- */
- 
- #include <gconfmm.h>
-+#include <cstdio>
- #include <iostream>
- 
- namespace Aeskulap {
--- a/aeskulap-i18n.patch
+++ b/aeskulap-i18n.patch
@ -1,781 +0,0 @@
-Author: Bruno Queirós <brunoqueiros _at_ portugalmail.com>
-Forwarded: https://savannah.nongnu.org/bugs/index.php?23957
-Descripton: Portugese translation update.
-License: Feel free to use it.
--- aeskulap-0.2.2-beta1.orig/po/pt.po
-+++ aeskulap-0.2.2-beta1/po/pt.po
-@@ -1,19 +1,20 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+# Portuguese translations of aeskulap
-+# Bruno Queirós <brunoqueiros@portugalmail.com>, 2008
- #
-#, fuzzy
- msgid ""
- msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: aeskulap\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-05-10 22:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2008-05-31 22:24+0100\n"
-+"Last-Translator: Bruno Queirós <brunoqueiros@portugalmail.com>\n"
-+"Language-Team:  <traduz@debian.pt>\n"
- "MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Poedit-Language: Portuguese\n"
-+"X-Poedit-Country: PORTUGAL\n"
-+"X-Poedit-SourceCharset: utf-8\n"
- 
- #. DEFAULT CT WINDOWLEVELS
- #.
-@@ -27,32 +28,33 @@
- #. Vertebrae   W:  2300 C:  530
- #: ../configuration/aconfiguration.cpp:52
- msgid "Abdomen"
-msgstr ""
-+msgstr "Abdómen"
- 
- #: ../configuration/aconfiguration.cpp:53
- msgid "Head"
-msgstr ""
-+msgstr "Cabeça"
- 
- #: ../configuration/aconfiguration.cpp:54
- msgid "Lung"
-msgstr ""
-+msgstr "Pulmão"
- 
- #: ../configuration/aconfiguration.cpp:55
- msgid "Mediastinum"
-msgstr ""
-+msgstr "Mediastinum"
- 
- #: ../configuration/aconfiguration.cpp:56
- msgid "Spine"
-msgstr ""
-+msgstr "Espinha"
- 
- #: ../configuration/aconfiguration.cpp:57
- msgid "Vertebrae"
-msgstr ""
-+msgstr "Vertebrae"
- 
-#: ../imagepool/netquery.cpp:112 ../imagepool/poolinstance.cpp:586
-+#: ../imagepool/netquery.cpp:112
-+#: ../imagepool/poolinstance.cpp:586
- #: ../imagepool/poolinstance.cpp:609
- msgid "no description"
-msgstr ""
-+msgstr "sem descrição"
- 
- #: ../widgets/aseriesmenu.cpp:45
- #, c-format
-@@ -60,6 +62,8 @@
- "Series %li (%s)\n"
- "%s"
- msgstr ""
-+"Séries %li (%s)\n"
-+"%s"
- 
- #: ../widgets/aseriesmenu.cpp:48
- #, c-format
-@@ -67,215 +71,227 @@
- "Series %li (%s)\n"
- "No description"
- msgstr ""
-+"Séries %li (%s)\n"
-+"Sem descrição"
- 
-#: ../widgets/seriesview.cpp:322 ../widgets/awindowleveltoolbutton.cpp:100
-+#: ../widgets/seriesview.cpp:322
-+#: ../widgets/awindowleveltoolbutton.cpp:100
- #: ../widgets/awindowleveltoolbutton.cpp:107
- #: ../widgets/awindowleveltoolbutton.cpp:143
- #: ../widgets/awindowleveltoolbutton.cpp:144
- msgid "Custom"
-msgstr ""
-+msgstr "Personalizado"
- 
- #: ../widgets/adisplay.cpp:160
- msgid "Acc:\n"
-msgstr ""
-+msgstr "Acc:\n"
- 
- #: ../widgets/adisplay.cpp:162
- msgid "Acq Tm: "
-msgstr ""
-+msgstr "Acq Tm: "
- 
- #: ../widgets/adisplay.cpp:175
- #, c-format
- msgid "Image: %i / %i"
-msgstr ""
-+msgstr "Imagem: %i / %i"
- 
-#: ../widgets/adisplay.cpp:513 ../widgets/adisplay.cpp:565
-+#: ../widgets/adisplay.cpp:513
-+#: ../widgets/adisplay.cpp:565
- #, c-format
- msgid "%i mm"
-msgstr ""
-+msgstr "%i mm"
- 
- #: ../widgets/studyview.cpp:110
- msgid "Rearrange the series of the current study"
-msgstr ""
-+msgstr "Organizar as séries do estudo actual"
- 
- #: ../widgets/studyview.cpp:111
- msgid "Display the series tiling menu"
-msgstr ""
-+msgstr "Mostra o menu das séries tiling"
- 
- #: ../widgets/studyview.cpp:120
- msgid "Toggle single series mode"
-msgstr ""
-+msgstr "Alternar modo de séries únicas"
- 
- #: ../widgets/studyview.cpp:121
- msgid "Display the series selection menu"
-msgstr ""
-+msgstr "Mostra o menu da selecção das séries"
- 
- #: ../widgets/studyview.cpp:129
- msgid "Rearrange the images of the selected series"
-msgstr ""
-+msgstr "Organizar as imagens das séries seleccionadas"
- 
- #: ../widgets/studyview.cpp:130
- msgid "Display the the image tiling menu"
-msgstr ""
-+msgstr "Mostrar o menu das imagens tiling"
- 
- #: ../widgets/studyview.cpp:139
- msgid "Display references of the selected series"
-msgstr ""
-+msgstr "Mostra as referências das séries seleccionadas"
- 
- #: ../widgets/studyview.cpp:143
- msgid "Navigate through 3D views"
-msgstr ""
-+msgstr "Navegar pelas vistas 3D"
- 
- #: ../widgets/studyview.cpp:147
- msgid "Display image values under the cursor"
-msgstr ""
-+msgstr "Mostra os valores das imagens por debaixo do cursor"
- 
- #: ../widgets/studyview.cpp:156
- msgid "Measurement tools"
-msgstr ""
-+msgstr "Ferramentas de medição"
- 
- #: ../widgets/studyview.cpp:784
- msgid "new windowlevel"
-msgstr ""
-+msgstr "novo níveljanela"
- 
-#: ../widgets/adatefilter.cpp:44 ../widgets/adatefilter.cpp:49
-#: ../widgets/adatefilter.cpp:91 ../widgets/adatefilter.cpp:97
-+#: ../widgets/adatefilter.cpp:44
-+#: ../widgets/adatefilter.cpp:49
-+#: ../widgets/adatefilter.cpp:91
-+#: ../widgets/adatefilter.cpp:97
- msgid "None"
-msgstr ""
-+msgstr "Nenhum"
- 
-#: ../widgets/adatefilter.cpp:45 ../widgets/adatefilter.cpp:104
-+#: ../widgets/adatefilter.cpp:45
-+#: ../widgets/adatefilter.cpp:104
- msgid "Today"
-msgstr ""
-+msgstr "Hoje"
- 
-#: ../widgets/adatefilter.cpp:46 ../widgets/adatefilter.cpp:110
-+#: ../widgets/adatefilter.cpp:46
-+#: ../widgets/adatefilter.cpp:110
- msgid "Yesterday"
-msgstr ""
-+msgstr "Ontem"
- 
-#: ../widgets/adatefilter.cpp:47 ../widgets/adatefilter.cpp:116
-+#: ../widgets/adatefilter.cpp:47
-+#: ../widgets/adatefilter.cpp:116
- msgid "Date"
-msgstr ""
-+msgstr "Data"
- 
-#: ../widgets/adatefilter.cpp:48 ../widgets/adatefilter.cpp:125
-+#: ../widgets/adatefilter.cpp:48
-+#: ../widgets/adatefilter.cpp:125
- msgid "Range"
-msgstr ""
-+msgstr "Intervalo"
- 
- #: ../widgets/adatefilter.cpp:177
- msgid "Select date"
-msgstr ""
-+msgstr "Seleccione data"
- 
- #: ../widgets/adatefilter.cpp:183
- msgid "Select Enddate"
-msgstr ""
-+msgstr "Seleccionar Enddate"
- 
- #: ../widgets/awindowleveltoolbutton.cpp:24
- msgid "Invert windowlevel"
-msgstr ""
-+msgstr "Inverter níveljanela"
- 
- #: ../widgets/awindowleveltoolbutton.cpp:55
- msgid "Add new windowlevel preset"
-msgstr ""
-+msgstr "Adicionar uma nova pré-definição níveljanela"
- 
- #: ../widgets/awindowleveltoolbutton.cpp:99
- #: ../widgets/awindowleveltoolbutton.cpp:103
- #: ../widgets/awindowleveltoolbutton.cpp:151
- #: ../widgets/awindowleveltoolbutton.cpp:157
- msgid "Default"
-msgstr ""
-+msgstr "Padrão"
- 
- #: ../src/astockids.cpp:73
- msgid "1 Image"
-msgstr ""
-+msgstr "Imagem 1"
- 
- #: ../src/astockids.cpp:74
- msgid "1x2 Images"
-msgstr ""
-+msgstr "Imagens 1x2"
- 
- #: ../src/astockids.cpp:75
- msgid "2x1 Images"
-msgstr ""
-+msgstr "Imagens 2x1"
- 
- #: ../src/astockids.cpp:76
- msgid "2x2 Images"
-msgstr ""
-+msgstr "Imagens 2x2"
- 
- #: ../src/astockids.cpp:77
- msgid "4x4 Images"
-msgstr ""
-+msgstr "Imagens 4x4"
- 
- #: ../src/astockids.cpp:78
- msgid "Single"
-msgstr ""
-+msgstr "Único"
- 
- #: ../src/astockids.cpp:79
- msgid "All"
-msgstr ""
-+msgstr "Todos"
- 
- #: ../src/astockids.cpp:80
- msgid "1 Series"
-msgstr ""
-+msgstr "Séries 1"
- 
- #: ../src/astockids.cpp:81
- msgid "2x1 Series"
-msgstr ""
-+msgstr "Séries 2x1"
- 
- #: ../src/astockids.cpp:82
- msgid "2x2 Series"
-msgstr ""
-+msgstr "Séries 2x2"
- 
- #: ../src/astockids.cpp:83
- msgid "3x2 Series"
-msgstr ""
-+msgstr "Séries 3x2"
- 
- #: ../src/astockids.cpp:84
- msgid "3x3 Series"
-msgstr ""
-+msgstr "Séries 3x3"
- 
- #: ../src/astockids.cpp:85
- msgid "4x4 Series"
-msgstr ""
-+msgstr "Séries 4x4"
- 
- #: ../src/astockids.cpp:86
- msgid "Reference"
-msgstr ""
-+msgstr "Referência"
- 
- #: ../src/astockids.cpp:87
- msgid "Delete item"
-msgstr ""
-+msgstr "Apagar item"
- 
- #: ../src/astockids.cpp:88
- msgid "3D Cursor"
-msgstr ""
-+msgstr "Cursor 3D"
- 
- #: ../src/astockids.cpp:89
- msgid "Value Picker"
-msgstr ""
-+msgstr "Seleccionador de Valores"
- 
- #: ../src/astockids.cpp:90
- msgid "Measure"
-msgstr ""
-+msgstr "Medida"
- 
-#: ../src/mainwindow.cpp:57 ../src/mainwindow.cpp:183
-+#: ../src/mainwindow.cpp:57
-+#: ../src/mainwindow.cpp:183
- msgid "Open DICOM Image files"
-msgstr ""
-+msgstr "Abrir ficheiros de Imagem DICOM"
- 
- #: ../src/mainwindow.cpp:117
- msgid "Bring opened files to front"
-msgstr ""
-+msgstr "Trazer ficheiros abertos para a frente"
- 
- #: ../src/mainwindow.cpp:125
- msgid "DICOM files"
-msgstr ""
-+msgstr "Ficheiros DICOM"
- 
- #: ../src/mainwindow.cpp:128
- msgid "Any files"
-msgstr ""
-+msgstr "Qualquer ficheiro"
- 
- #: ../src/mainwindow.cpp:131
- msgid "DICOMDIR files"
-msgstr ""
-+msgstr "Ficheiros DICOMDIR"
- 
-#: ../src/mainwindow.cpp:155 ../src/aeskulap.glade.h:37
-+#: ../src/mainwindow.cpp:155
-+#: ../src/aeskulap.glade.h:37
- msgid "Open DICOMDIR"
-msgstr ""
-+msgstr "Abrir DICOMDIR"
- 
- #: ../src/mainwindow.cpp:247
- msgid ""
-@@ -284,246 +300,262 @@
- "\n"
- "The request was sent to the server but no response has been received."
- msgstr ""
-+"<span weight=\"bold\" size=\"larger\">Incapaz de receber\n"
-+"as imagens pedidas</span>\n"
-+"\n"
-+"O pedido foi enviado para o servidor mas não se recebeu qualquer resposta."
- 
- #: ../src/studymanager.cpp:99
- msgid "Patientsname"
-msgstr ""
-+msgstr "Nomepacientes"
- 
- #: ../src/studymanager.cpp:100
- msgid "Birthdate"
-msgstr ""
-+msgstr "Data de nascimento"
- 
-#: ../src/studymanager.cpp:101 ../src/settings.cpp:151 ../src/settings.cpp:502
-+#: ../src/studymanager.cpp:101
-+#: ../src/settings.cpp:151
-+#: ../src/settings.cpp:502
- msgid "Description"
-msgstr ""
-+msgstr "Descrição"
- 
-#: ../src/studymanager.cpp:102 ../src/aeskulap.glade.h:34
-+#: ../src/studymanager.cpp:102
-+#: ../src/aeskulap.glade.h:34
- msgid "Modality"
-msgstr ""
-+msgstr "Modalidade"
- 
- #: ../src/studymanager.cpp:103
- msgid "Date/Time"
-msgstr ""
-+msgstr "Data/Tempo"
- 
- #: ../src/studymanager.cpp:104
- msgid "Station"
-msgstr ""
-+msgstr "Estação"
- 
-#: ../src/studymanager.cpp:105 ../src/aeskulap.glade.h:42
-+#: ../src/studymanager.cpp:105
-+#: ../src/aeskulap.glade.h:42
- msgid "Server"
-msgstr ""
-+msgstr "Servidor"
- 
-#: ../src/studymanager.cpp:127 ../src/settings.cpp:126
-+#: ../src/studymanager.cpp:127
-+#: ../src/settings.cpp:126
- #: ../src/aeskulap.glade.h:29
- msgid "Group"
-msgstr ""
-+msgstr "Grupo"
- 
- #: ../src/studymanager.cpp:174
- msgid "<span weight=\"bold\" size=\"larger\">No results for this query</span>"
-msgstr ""
-+msgstr "<span weight=\"bold\" size=\"larger\">Nenhum resultado para esta query</span>"
- 
- #: ../src/studymanager.cpp:198
- msgid "<span weight=\"bold\" size=\"larger\">No study or bad DICOMDIR</span>"
-msgstr ""
-+msgstr "<span weight=\"bold\" size=\"larger\">Nenhum estudo ou DICOMDIR corrupto</span>"
- 
- #: ../src/studymanager.cpp:277
- #, c-format
- msgid "Series %02i (1 Image)"
-msgstr ""
-+msgstr "Séries %02i (1 Imagem)"
- 
- #: ../src/studymanager.cpp:280
- #, c-format
- msgid "Series %02i (%i Images)"
-msgstr ""
-+msgstr "Séries %02i (%i Imagens)"
- 
- #: ../src/studymanager.cpp:283
- #, c-format
- msgid "Series %02i"
-msgstr ""
-+msgstr "Séries %02i"
- 
-#: ../src/settings.cpp:122 ../src/aeskulap.glade.h:36
-+#: ../src/settings.cpp:122
-+#: ../src/aeskulap.glade.h:36
- msgid "Name"
-msgstr ""
-+msgstr "Nome"
- 
-#: ../src/settings.cpp:123 ../src/aeskulap.glade.h:16
-+#: ../src/settings.cpp:123
-+#: ../src/aeskulap.glade.h:16
- msgid "AET"
-msgstr ""
-+msgstr "AET"
- 
-#: ../src/settings.cpp:124 ../src/aeskulap.glade.h:38
-+#: ../src/settings.cpp:124
-+#: ../src/aeskulap.glade.h:38
- msgid "Port"
-msgstr ""
-+msgstr "Porta"
- 
- #: ../src/settings.cpp:125
- msgid "Hostname"
-msgstr ""
-+msgstr "Nome da máquina"
- 
- #: ../src/settings.cpp:152
- msgid "Center"
-msgstr ""
-+msgstr "Centro"
- 
- #: ../src/settings.cpp:153
- msgid "Width"
-msgstr ""
-+msgstr "Largura"
- 
- #: ../src/settings.cpp:410
- msgid ""
- "<span weight=\"bold\" size=\"larger\">Echo test failed!</span>\n"
- "\n"
- msgstr ""
-+"<span weight=\"bold\" size=\"larger\">Teste Eco falhou!</span>\n"
-+"\n"
- 
- #: ../src/settings.cpp:426
- msgid "<span weight=\"bold\" size=\"larger\">Echo succeeded</span>"
-msgstr ""
-+msgstr "<span weight=\"bold\" size=\"larger\">Eco teve sucesso</span>"
- 
- #: ../src/aeskulap.glade.h:1
- msgid "(C) 2005 Alexander Pipelka"
-msgstr ""
-+msgstr "(C) 2005 Alexander Pipelka"
- 
- #: ../src/aeskulap.glade.h:2
- msgid "<b>Accessionnumber:</b>"
-msgstr ""
-+msgstr "<b>Accessionnumber:</b>"
- 
- #: ../src/aeskulap.glade.h:3
- msgid "<b>Character Set</b>"
-msgstr ""
-+msgstr "<b>Character Set</b>"
- 
- #: ../src/aeskulap.glade.h:4
- msgid "<b>Date:</b>"
-msgstr ""
-+msgstr "<b>Data:</b>"
- 
- #: ../src/aeskulap.glade.h:5
- msgid "<b>Details</b>"
-msgstr ""
-+msgstr "<b>Detalhes</b>"
- 
- #: ../src/aeskulap.glade.h:6
- msgid "<b>Local DICOM Settings</b>"
-msgstr ""
-+msgstr "<b>Local DICOM Settings</b>"
- 
- #: ../src/aeskulap.glade.h:7
- msgid "<b>Modality:</b>"
-msgstr ""
-+msgstr "<b>Modalidade:</b>"
- 
- #: ../src/aeskulap.glade.h:8
- msgid "<b>Name:</b>"
-msgstr ""
-+msgstr "<b>Nome:</b>"
- 
- #: ../src/aeskulap.glade.h:9
- msgid "<b>Patient ID:</b>"
-msgstr ""
-+msgstr "<b>ID Paciente:</b>"
- 
- #: ../src/aeskulap.glade.h:10
- msgid "<b>Prescanning files ...</b>"
-msgstr ""
-+msgstr "<b>Pré-pesquisando ficheiros ...</b>"
- 
- #: ../src/aeskulap.glade.h:11
- msgid "<b>Servergroups</b>"
-msgstr ""
-+msgstr "<b>Grupos servidor</b>"
- 
- #: ../src/aeskulap.glade.h:12
- msgid "<b>Stationname:</b>"
-msgstr ""
-+msgstr "<b>Nome da estação:</b>"
- 
- #: ../src/aeskulap.glade.h:13
- msgid "<b>Study Description:</b>"
-msgstr ""
-+msgstr "<b>Descrição do Estudo:</b>"
- 
- #: ../src/aeskulap.glade.h:14
- msgid "<b>Study List</b>"
-msgstr ""
-+msgstr "<b>Lista Estudo</b>"
- 
- #: ../src/aeskulap.glade.h:15
- msgid "<b>required</b>"
-msgstr ""
-+msgstr "<b>necessário</b>"
- 
- #: ../src/aeskulap.glade.h:17
- msgid "Add windowlevel"
-msgstr ""
-+msgstr "Adicionar níveljanela"
- 
- #: ../src/aeskulap.glade.h:18
- msgid "Advanced query options"
-msgstr ""
-+msgstr "Opções avançadas da query"
- 
- #: ../src/aeskulap.glade.h:19
- msgid "Aeskulap Viewer"
-msgstr ""
-+msgstr "Visualizador Aeskulap"
- 
- #: ../src/aeskulap.glade.h:20
- msgid ""
- "CT\n"
- "CR"
- msgstr ""
-+"CT\n"
-+"CR"
- 
- #: ../src/aeskulap.glade.h:22
- msgid "Center:"
-msgstr ""
-+msgstr "Centro:"
- 
- #: ../src/aeskulap.glade.h:23
- msgid "Clear"
-msgstr ""
-+msgstr "Limpar"
- 
- #: ../src/aeskulap.glade.h:24
- msgid "Clear Filter"
-msgstr ""
-+msgstr "Limpar Filtro"
- 
- #: ../src/aeskulap.glade.h:25
- msgid "DICOM Settings"
-msgstr ""
-+msgstr "Configurações DICOM"
- 
- #: ../src/aeskulap.glade.h:26
- msgid "Description:"
-msgstr ""
-+msgstr "Descrição:"
- 
- #: ../src/aeskulap.glade.h:27
- msgid "Echotest"
-msgstr ""
-+msgstr "Echotest"
- 
- #: ../src/aeskulap.glade.h:28
- msgid "Fullscreen"
-msgstr ""
-+msgstr "Ecrã Inteiro"
- 
- #: ../src/aeskulap.glade.h:30
- msgid "IP / Hostname"
-msgstr ""
-+msgstr "IP / Nome da máquina"
- 
- #: ../src/aeskulap.glade.h:31
- msgid "Local AET"
-msgstr ""
-+msgstr "AET Local"
- 
- #: ../src/aeskulap.glade.h:32
- msgid "Medical image viewer and DICOM network client\n"
-msgstr ""
-+msgstr "Visualizador de imagens médico e cliente de rede DICOM\n"
- 
- #: ../src/aeskulap.glade.h:35
- msgid "Modality:"
-msgstr ""
-+msgstr "Modalidade:"
- 
- #: ../src/aeskulap.glade.h:39
- msgid "Presets"
-msgstr ""
-+msgstr "Pré-definições"
- 
- #: ../src/aeskulap.glade.h:40
- msgid "Scanning files"
-msgstr ""
-+msgstr "Pesquisando ficheiros"
- 
- #: ../src/aeskulap.glade.h:41
- msgid "Search"
-msgstr ""
-+msgstr "Procura"
- 
- #: ../src/aeskulap.glade.h:43
- msgid "Servers"
-msgstr ""
-+msgstr "Servidores"
- 
- #: ../src/aeskulap.glade.h:44
- msgid "Settings"
-msgstr ""
-+msgstr "Configurações"
- 
- #: ../src/aeskulap.glade.h:45
- msgid "Specific Characterset"
-msgstr ""
-+msgstr "Específico CódigoCaracteres"
- 
- #: ../src/aeskulap.glade.h:46
- msgid "Study Manager"
-msgstr ""
-+msgstr "Gestor Estúdio"
- 
- #: ../src/aeskulap.glade.h:47
- msgid ""
-@@ -538,14 +570,24 @@
- "DCMTK - OFFIS DICOM Toolkit:\n"
- "BSD/MIT"
- msgstr ""
-+"O código fonte do Aeskulap é licenciado sob os seguintes termos:\n"
-+"\n"
-+"Aesuklap aplicação principal:\n"
-+"GPL\n"
-+"\n"
-+"Libraria ImagePool DICOM Bridge:\n"
-+"LGPL\n"
-+"\n"
-+"DCMTK - OFFIS DICOM Toolkit:\n"
-+"BSD/MIT"
- 
- #: ../src/aeskulap.glade.h:57
- msgid "Width:"
-msgstr ""
-+msgstr "Largura:"
- 
- #: ../src/aeskulap.glade.h:58
- msgid "Windowlevels"
-msgstr ""
-+msgstr "NíveisJanela"
- 
- #: ../src/aeskulap.glade.h:59
- msgid ""
-@@ -556,36 +598,43 @@
- "MR\n"
- "SC\n"
- msgstr ""
-+"XA\n"
-+"CT\n"
-+"CR\n"
-+"NM\n"
-+"MR\n"
-+"SC\n"
- 
- #: ../src/aeskulap.glade.h:66
- msgid "_DicomDir"
-msgstr ""
-+msgstr "_DicomDir"
- 
- #: ../src/aeskulap.glade.h:67
- msgid "_Edit"
-msgstr ""
-+msgstr "_Editar"
- 
- #: ../src/aeskulap.glade.h:68
- msgid "_File"
-msgstr ""
-+msgstr "_Ficheiro"
- 
- #: ../src/aeskulap.glade.h:69
- msgid "_Help"
-msgstr ""
-+msgstr "_HAjuda"
- 
- #: ../src/aeskulap.glade.h:70
- msgid "_View"
-msgstr ""
-+msgstr "_Ver"
- 
- #: ../src/aeskulap.glade.h:71
- msgid "non-standard relational queries"
-msgstr ""
-+msgstr "queries relacionais não-padronizadas"
- 
- #: ../src/aeskulap.glade.h:72
- msgid "prefer lossy JPEG compression"
-msgstr ""
-+msgstr "prefere compressão lossy JPEG"
- 
- #. TRANSLATORS: Replace this string with your names, one name per line.
- #: ../src/aeskulap.glade.h:74
- msgid "translator-credits"
-msgstr ""
-+msgstr "Bruno Queirós"
-+
--- a/aeskulap-oflog.patch
+++ b/aeskulap-oflog.patch
@ -1,13 +0,0 @@
-Index: aeskulap-0.2.2b1/configure.in
-===================================================================
--- aeskulap-0.2.2b1.orig/configure.in	2011-02-14 13:39:50.000000000 +0100
-+++ aeskulap-0.2.2b1/configure.in	2011-02-14 13:38:48.000000000 +0100
-@@ -103,7 +103,7 @@
- AC_SUBST(DCMTK_LIBS)
- 
- 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"
- 
- dnl set PREFIX
- if test "x${prefix}" = "xNONE"; then
--- a/aeskulap-patientNames.patch
+++ b/aeskulap-patientNames.patch
@ -1,68 +0,0 @@
-Index: aeskulap-0.2.2b1/imagepool/netloader.cpp
-===================================================================
--- aeskulap-0.2.2b1.orig/imagepool/netloader.cpp	2011-02-14 11:48:44.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/netloader.cpp	2011-02-14 11:48:47.000000000 +0100
-@@ -112,7 +112,7 @@
- 		e->putString("STUDY");
- 		query.insert(e);
- 
-		e = newDicomElement(DCM_PatientsName);
-+		e = newDicomElement(DCM_PatientName);
- 		query.insert(e);
- 
- 		e = newDicomElement(DCM_PatientID);
-Index: aeskulap-0.2.2b1/imagepool/netquery.cpp
-===================================================================
--- aeskulap-0.2.2b1.orig/imagepool/netquery.cpp	2011-02-14 11:48:44.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/netquery.cpp	2011-02-14 11:48:47.000000000 +0100
-@@ -210,7 +210,7 @@
- 	e->putString(dicom_enc.c_str());
- 	query.insert(e);
- 
-	e = newDicomElement(DCM_PatientsName);
-+	e = newDicomElement(DCM_PatientName);
- 	e->putString(patientsname.c_str());
- 	query.insert(e);
- 
-@@ -225,10 +225,10 @@
- 	e->putString(modality.c_str());
- 	query.insert(e);
- 
-	e = newDicomElement(DCM_PatientsBirthDate);
-+	e = newDicomElement(DCM_PatientBirthDate);
- 	query.insert(e);
- 
-	e = newDicomElement(DCM_PatientsSex);
-+	e = newDicomElement(DCM_PatientSex);
- 	query.insert(e);
- 
- 	e = newDicomElement(DCM_StudyDate);
-Index: aeskulap-0.2.2b1/imagepool/poolinstance.cpp
-===================================================================
--- aeskulap-0.2.2b1.orig/imagepool/poolinstance.cpp	2011-02-14 12:10:41.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/poolinstance.cpp	2011-02-14 12:11:04.000000000 +0100
-@@ -515,7 +515,7 @@
- 	}
- 
- 	// set ManufacturersModelName
-	if(dset->findAndGetOFString(DCM_ManufacturersModelName, ofstr).good()) {
-+	if(dset->findAndGetOFString(DCM_ManufacturerModelName, ofstr).good()) {
- 		r->m_model = ofstr.c_str();
- 	}
- 	
-@@ -565,12 +565,12 @@
- 	//std::cout << "intercept: " << r->m_intercept << std::endl;
- 
- 	// study params
-	if(dset->findAndGetOFString(DCM_PatientsName, ofstr).good()) {
-+	if(dset->findAndGetOFString(DCM_PatientName, ofstr).good()) {
- 		r->m_patientsname = r->convert_string(ofstr.c_str());
- 	}
-	dset->findAndGetOFString(DCM_PatientsBirthDate, ofstr);
-+	dset->findAndGetOFString(DCM_PatientBirthDate, ofstr);
- 	r->m_patientsbirthdate = ofstr.c_str();
-	dset->findAndGetOFString(DCM_PatientsSex, ofstr);
-+	dset->findAndGetOFString(DCM_PatientSex, ofstr);
-     r->m_patientssex = ofstr.c_str();
- 	if(dset->findAndGetOFString(DCM_StudyDescription, ofstr).good()) {
- 		r->m_studydescription = r->convert_string(ofstr.c_str());
--- a/aeskulap.spec
+++ b/aeskulap.spec
@ -1,38 +1,38 @@
-# Note: devel package does not contain any headers. Do I need to add them?
-# .so files are shared libraries, I need to call /sbin/ldconfig, but where? In a
-# post section for the devel package?
-# Schemas handling also needs to be looked at.
+%global git e467dfd
+%global github jenslody-aeskulap
+%global checkout git%{git}
+%global checkout_date 20151201
+
+%if 0%{?fedora} < 23
+%global _hardened_build 1
+%endif
+
 Name:           aeskulap
 Version:        0.2.2
-Release:        0.22beta1%{?dist}
-Summary:        A full open source replacement for commercially available DICOM viewers
+Release:        0.25.beta1%{?dist}
+Summary:        Full open source replacement for commercially available DICOM viewers
+# The sources of the (internal) libraries are LGPLv2+, the rest of the sources are GPLv2+,
+# except binreloc.{c,h} and the documentation, which are in the public domain
+License:        GPLv2+ and LGPLv2+ and Public Domain
+URL:            https://github.com/jenslody/aeskulap

-License:        LGPLv2+
-URL:            http://aeskulap.nongnu.org
-
-Source0:        http://www.bms-austria.com/~pipelka/aeskulap/%{name}-%{version}-beta1.tar.gz
-Source1:        %{name}-tutorials.pdf
-# applied all the patches from the debian package
-# svn export svn://svn.debian.org/svn/debian-med/trunk/packages/aeskulap/trunk/ aeskulap-debian
-Patch0:         %{name}-circular-svg.patch
-Patch2:         %{name}-DcmElement.patch
-Patch3:         %{name}-desktop.patch
-Patch4:         %{name}-findAndCopyElement.patch
-Patch5:         %{name}-gcc.patch
-Patch6:         %{name}-i18n.patch
-# This is used to update the configure.in before running autoreconf to update the autotoolization. 
-Patch7:         %{name}-configure.patch
-Patch8:         %{name}-oflog.patch
-Patch9:         %{name}-patientNames.patch
+Source0:        https://github.com/jenslody/%{name}/tarball/master/%{github}-%{git}.tar.gz

 BuildRequires:   dcmtk-devel
-BuildRequires:   intltool libpng-devel libjpeg-turbo-devel
-BuildRequires:   libtiff-devel gtkmm24-devel libglademm24-devel 
-BuildRequires:   gconfmm26-devel libtool
+BuildRequires:   intltool
+BuildRequires:   libpng-devel
+BuildRequires:   libjpeg-turbo-devel
+BuildRequires:   libtiff-devel
+BuildRequires:   libtool
 BuildRequires:   openssl-devel
 BuildRequires:   gettext-devel
 BuildRequires:   tcp_wrappers-devel
 BuildRequires:   desktop-file-utils
+BuildRequires:   pkgconfig(gtkmm-2.4)
+BuildRequires:   pkgconfig(libglademm-2.4)
+BuildRequires:   pkgconfig(gthread-2.0)
+BuildRequires:   pkgconfig(gconfmm-2.6)
+BuildRequires:   libappstream-glib
 BuildRequires:   GConf2
 Requires(pre):   GConf2
 Requires(post):  GConf2
@ -52,79 +52,32 @@ under Linux. Ports of these packages are available for different
 platforms. It should be quite easy to port Aeskulap to any platform
 were these packages are available.

+%package doc
+Summary: Documentation for aeskulap
+BuildArch:       noarch
+
+%description doc
+Documentation for aeskulap.
+
 %prep
-%setup -q -n %{name}-%{version}-beta1
-# configure.in patch
-%patch7 -p1
-# otherwise it fails
-# apply patches
-%patch0 -p1
-%patch2 -p1
-%patch3 -p2
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-
-# remove bundled copy of dcmtk!
-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
+%setup -q -n %{github}-%{git}
+autoreconf --force --install
+intltoolize --force --copy --automake

 %build
-# point her to the correct lib version depending on the arch
-sed -i 's/lib -ldcmjpeg/%{_lib}\/dcmtk -ldcmjpeg/' configure configure.in
+# point to the correct lib version depending on the arch
+sed -i 's/lib -ldcmjpeg/%{_lib} -ldcmjpeg/' configure configure.ac

+export CPPFLAGS='-std=c++11'
 %configure --disable-static --disable-schemas-install
-make
-# make %{?_smp_mflags}
+make %{?_smp_mflags} 

 %install
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install

-# Register as an application to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
-<!--
-EmailAddress: pipelka@teleweb.at
-EmailSent:    2014-09-17
-->
-<application>
-<id type="desktop">aeskulap.desktop</id>
-<metadata_license>CC0-1.0</metadata_license>
-<summary>Medical image viewer</summary>
-<description>
-<p>
-Aeskulap is a viewer for medical images with support for the DICOM format.
-</p>
-</description>
-<url type="homepage">http://aeskulap.nongnu.org</url>
-<screenshots>
-<screenshot type="default">http://aeskulap.nongnu.org/gfx/screenshot1-full.jpg</screenshot>
-</screenshots>
-</application>
-EOF
-
-install -p -m 0644 %{SOURCE1} -t .
-
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
-
-# remove .la files. Is this sufficient?
-find $RPM_BUILD_ROOT -name "*.la" -exec rm -fv '{}' \;
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml

 %find_lang %{name}

@ -134,6 +87,7 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm -fv '{}' \;
 %post
 %gconf_schema_upgrade %{name}
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :

 %preun
 %gconf_schema_remove %{name}
@ -143,6 +97,7 @@ if [ $1 -eq 0 ] ; then
    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+/usr/bin/update-desktop-database &> /dev/null || :

 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@ -151,22 +106,52 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
 %{_datadir}/%{name}/
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%doc AUTHORS ABOUT-NLS ChangeLog COPYING README %{name}-tutorials.pdf
+%exclude %{_libdir}/%{name}/*.la
+%doc AUTHORS ABOUT-NLS ChangeLog README
+%license COPYING COPYING.LIB
+
+%files doc
+%doc doc/%{name}-tutorials.pdf
+%license COPYING.DOC

 %changelog
-* Tue Apr 21 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.2.2-0.22beta1
- Minor fixes
+* Tue Dec 01 2015 Jens Lody <fedora@jenslody.de> - 0.2.2-0.25.beta1
+- Add license file, to doc-package.

-* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 0.2.2-0.21beta1
- Add an AppData file for the software center
+* Tue Nov 24 2015 Jens Lody <fedora@jenslody.de> - 0.2.2-0.24.beta1
+- Fix dependency for doc- and debuginfo-package.
+- Fix license strings in spec-file and appdata.
+- Enable hardened build for F22
+- Added COPYING.LIB.

-* Tue Dec 16 2014 Mario Ceresa <mrceresa AT fedoraproject DOT org> - 0.2.2-0.20beta1
- Bump up for dcmtk rebuild
+* Sun Nov 22 2015 Jens Lody <fedora@jenslody.de> - 0.2.2-0.23.beta1
+- Use own fork of github-repo.
+- Remove dcmtk-sources.
+- Include all patches in source.
+- Update autotools, to remove deprecated macros and reduce warnings.
+- Add appdata-file.
+
+* Fri Nov 20 2015 Jens Lody <fedora@jenslody.de> - 0.2.2-0.22.beta1
+- Use github-repo,
+- reduced amount of patches.
+
+* Thu Oct 08 2015 Jens Lody <fedora@jenslody.de> - 0.2.2-0.21beta1
+- Add '-std=c++11' flag, because (at least) recent glibmm24 requires it.
+- Update desktop-database, as it is required by packaging guidelines.
+- Added url for doc-file,
+- Split off doc-package (~ 1MB).
+
+* Sun Oct 04 2015 Jens Lody <fedora@jenslody.de> - 0.2.2-0.20beta1
+- Add patch to work with dcmtk 3.6.1
+- Add patch to fix a crash in seriesview.cpp
+- Do not clean buildroot before install
+- Do not use defattr
+- More consisten macro-usage

 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-0.19beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@ -222,6 +207,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed Jun 29 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.2.2-0.2beta1
 - get rid of devel package
 - add tutorials as additional documentation
- 
+
 * Mon Jun 06 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.2.2-0.1beta1
 - initial rpm build
--- a/3
+++ b/3
@ -1,2 +1 @@
-33a0f8659909426c67bebc10bd61b1d0  aeskulap-0.2.2-beta1.tar.gz
-4fd44b2c92216d9ba3e15ad64e3f1985  aeskulap-tutorials.pdf
+0fe1766fd2c3ae37d06458ac57fc92a1  jenslody-aeskulap-e467dfd.tar.gz
Author	SHA1	Message	Date
Jens Lody	7edd6a03ae	Unretire for F22, F23 and rawhide. New upstram url, packaging fixes, bug-fix.	2015-12-01 23:16:20 +01:00
Till Maas	d38fd76f0c	2015-05-11: Retired because of broken deps in preparation of Fedora 22 Reference: https://fedorahosted.org/rel-eng/ticket/6154	2015-05-11 22:20:02 +02:00