diff --git a/.gitignore b/.gitignore index b787170..0fe1804 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ /xmedcon-0.10.7.tar.bz2 /xmedcon-0.14.1.tar.bz2 /xmedcon-0.16.1.tar.bz2 +/xmedcon-0.16.2.tar.bz2 +/xmedcon-0.22.0.tar.bz2 +/xmedcon-0.23.0.tar.bz2 +/xmedcon-0.24.0.tar.bz2 +/xmedcon-0.24.1.tar.bz2 +/xmedcon-0.25.3.tar.bz2 diff --git a/changelog b/changelog new file mode 100644 index 0000000..e683b7b --- /dev/null +++ b/changelog @@ -0,0 +1,133 @@ +* Sat Jul 22 2023 Fedora Release Engineering - 0.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.22.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Aug 28 2022 Filipe Rosset - 0.22.0-1 +- Update to 0.22.0 fix rhbz#1902428 + +* Sat Jul 23 2022 Fedora Release Engineering - 0.16.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.16.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.16.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 0.16.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 0.16.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 20 2020 Filipe Rosset - 0.16.2-1 +- Update to 0.16.2 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 16 2019 Filipe Rosset - 0.16.1-1 +- Update to latest upstream release 0.16.1 fixes rhbz #1566287 + +* Sun Feb 03 2019 Fedora Release Engineering - 0.14.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.14.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.14.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 0.14.1-3 +- Remove obsolete scriptlets + +* Wed Jan 03 2018 Ankur Sinha - 0.14.1-2 +- Remove stray requires + +* Sat Dec 30 2017 Ankur Sinha - 0.14.1-1 +- Update to latest upstream release +- remove png patch that isn't needed any more +- re-do configure patch +- use upstream appdata, remove our bit + +* Thu Aug 03 2017 Fedora Release Engineering - 0.10.7-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.10.7-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.10.7-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0.10.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.10.7-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Richard Hughes - 0.10.7-15 +- Add an AppData file for the software center + +* Mon Aug 18 2014 Fedora Release Engineering - 0.10.7-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.10.7-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.10.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun May 19 2013 Ankur Sinha 0.10.7-11 +- Fix for #904264 + +* Fri Feb 15 2013 Fedora Release Engineering - 0.10.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 28 2012 Ankur Sinha 0.10.7-9 +- Use Tom's patch to fix FTBFS because of libpng 1.5 +- Details here: rhbz#843662 + +* Sun Jul 22 2012 Fedora Release Engineering - 0.10.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.10.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 0.10.7-6 +- Rebuild for new libpng + +* Sun Nov 13 2011 Ankur Sinha - 0.10.7-5 +- Correct placements of includes and configure command +- RHBZ #753246 + +* Tue Aug 09 2011 Ankur Sinha - 0.10.7-4 +- Move xmedcon-config to -devel +- Correct requires for -devel +- Add icon, scriptlets +- Add desktop file, scriptlets +- Add a xmedconrc.linux file in docs +- Remove defattr + +* Tue Aug 09 2011 Ankur Sinha - 0.10.7-3 +- Fix license tag +- remove rpath +- https://bugzilla.redhat.com/show_bug.cgi?id=714328#c3 +- Fix sed + +* Sun Jul 03 2011 Ankur Sinha - 0.10.7-2 +- Make it use fPIC + +* Fri Jun 17 2011 Ankur Sinha - 0.10.7-1 +- Initial rpm build +- Based on the spec built by Erik Nolf for the srpm available at +- http://xmedcon.sourceforge.net/Main/Download + diff --git a/sources b/sources index 9b5a99e..a3c7981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmedcon-0.16.1.tar.bz2) = 528aa6ceadb79d8e65e5bd70f8458227ec11b8652d8fcb5759680492d0c36908900ec726733fcab6df4b6466cdac694896c9d4308595351dae4ab87cf69d4ed1 +SHA512 (xmedcon-0.25.3.tar.bz2) = 7acd7be6341cc92002116e16a8e975e290a232a9ed68e769365f183779f3a05ffd08b5752e5d77b7b91febb6a7577ff3573a4bc91757c6c5fe36acfbbbc2401c diff --git a/xmedcon.spec b/xmedcon.spec index 8b2131c..4edb63f 100644 --- a/xmedcon.spec +++ b/xmedcon.spec @@ -1,25 +1,36 @@ Name: xmedcon -Version: 0.16.1 -Release: 2%{?dist} +Version: 0.25.3 +Release: %autorelease Summary: A medical image conversion utility and library # Please refer to http://xmedcon.sourceforge.net/pub/readme/README for details # None of the libraries are bundled, they are appear to be modified versions of code taken # from the respective sources -# License needs more looking into to confirm correctness. All licenses are FOSS compatible though -License: LGPLv2+ and Copyright only and MIT and BSD and libtiff +# Breakdown +# ./source: GPLv2+ +# ./libs/nifti: Public Domain +# ./libs/tpc: LGPLv2.1+ +# spdx verified +License: GPL-2.0-or-later and LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain URL: http://xmedcon.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: xmedcon-configure.patch -BuildRequires: gtk2-devel nifticlib-devel -BuildRequires: libtpcimgio-devel libtpcmisc-devel -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib -BuildRequires: autoconf automake libtool +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} -#Requires: gtk2 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: desktop-file-utils +BuildRequires: gdk-pixbuf2-devel +BuildRequires: gtk3-devel +BuildRequires: libtool +BuildRequires: libappstream-glib +BuildRequires: libtpcimgio-devel +BuildRequires: libtpcmisc-devel +BuildRequires: make +BuildRequires: nifticlib-devel %description This project stands for Medical Image Conversion and is released under the @@ -42,8 +53,7 @@ for developing programs that make use of the (X)MedCon library (libmdc). %prep -%setup -q -%patch0 -p0 +%autosetup # Remove the sources of the nifti, since we're using fedora nifti here rm -rvf ./libs/nifti/ @@ -72,10 +82,10 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # so we'll only have the one common script for all arches sed -i 's|@libdir@|$(rpm -E %{_libdir})|' xmedcon-config.in -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install mv -v $RPM_BUILD_ROOT/%{_includedir}/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}/ @@ -93,7 +103,7 @@ desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE1} -appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/metainfo/xmedcon.appdata.xml # remove static libraries find $RPM_BUILD_ROOT -name "*.a" -execdir rm -fv '{}' \; @@ -103,14 +113,14 @@ find $RPM_BUILD_ROOT -name "*.la" -execdir rm -fv '{}' \; %files # leave out ChangeLog : zero length -%doc README REMARKS AUTHORS etc/%{name}rc.linux +%doc README REMARKS AUTHORS %license COPYING COPYING.LIB -%config(noreplace) %{_sysconfdir}/xmedconrc +%config(noreplace) %{_sysconfdir}/xmedcon.css %{_bindir}/medcon %{_bindir}/%{name} %{_libdir}/*so.* %{_mandir}/man1/* -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/xmedcon.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/%{name}.png @@ -126,102 +136,5 @@ find $RPM_BUILD_ROOT -name "*.la" -execdir rm -fv '{}' \; %{_bindir}/%{name}-config %changelog -* Sat Jul 27 2019 Fedora Release Engineering - 0.16.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 16 2019 Filipe Rosset - 0.16.1-1 -- Update to latest upstream release 0.16.1 fixes rhbz #1566287 - -* Sun Feb 03 2019 Fedora Release Engineering - 0.14.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.14.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.14.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 0.14.1-3 -- Remove obsolete scriptlets - -* Wed Jan 03 2018 Ankur Sinha - 0.14.1-2 -- Remove stray requires - -* Sat Dec 30 2017 Ankur Sinha - 0.14.1-1 -- Update to latest upstream release -- remove png patch that isn't needed any more -- re-do configure patch -- use upstream appdata, remove our bit - -* Thu Aug 03 2017 Fedora Release Engineering - 0.10.7-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.10.7-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.10.7-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.10.7-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.10.7-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 26 2015 Richard Hughes - 0.10.7-15 -- Add an AppData file for the software center - -* Mon Aug 18 2014 Fedora Release Engineering - 0.10.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.10.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.10.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun May 19 2013 Ankur Sinha 0.10.7-11 -- Fix for #904264 - -* Fri Feb 15 2013 Fedora Release Engineering - 0.10.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 28 2012 Ankur Sinha 0.10.7-9 -- Use Tom's patch to fix FTBFS because of libpng 1.5 -- Details here: rhbz#843662 - -* Sun Jul 22 2012 Fedora Release Engineering - 0.10.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.10.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 0.10.7-6 -- Rebuild for new libpng - -* Sun Nov 13 2011 Ankur Sinha - 0.10.7-5 -- Correct placements of includes and configure command -- RHBZ #753246 - -* Tue Aug 09 2011 Ankur Sinha - 0.10.7-4 -- Move xmedcon-config to -devel -- Correct requires for -devel -- Add icon, scriptlets -- Add desktop file, scriptlets -- Add a xmedconrc.linux file in docs -- Remove defattr - -* Tue Aug 09 2011 Ankur Sinha - 0.10.7-3 -- Fix license tag -- remove rpath -- https://bugzilla.redhat.com/show_bug.cgi?id=714328#c3 -- Fix sed - -* Sun Jul 03 2011 Ankur Sinha - 0.10.7-2 -- Make it use fPIC - -* Fri Jun 17 2011 Ankur Sinha - 0.10.7-1 -- Initial rpm build -- Based on the spec built by Erik Nolf for the srpm available at -- http://xmedcon.sourceforge.net/Main/Download +%autochangelog