- up to 4.3HEADauto/th/gnofract4d-4.3-1master

3 files changed, 19 insertions, 75 deletions

diff --git a/gnofract4d-desktop.patch b/gnofract4d-desktop.patch
index 3e765fb..4db7c17 100644
--- a/gnofract4d-desktop.patch
+++ b/gnofract4d-desktop.patch
@@ -1,20 +1,18 @@
 diff -bur gnofract4d-2.13.orig/gnofract4d.desktop gnofract4d-2.13/gnofract4d.desktop
 --- gnofract4d-2.13.orig/gnofract4d.desktop	2006-04-30 09:41:00.553727250 +0200
 +++ gnofract4d-2.13/gnofract4d.desktop	2006-04-30 09:42:54.224831250 +0200
-@@ -2,12 +2,13 @@
- Version=2.12
- Encoding=UTF-8
+@@ -1,10 +2,13 @@
+ [Desktop Entry]
+ Version=1.0
  Name=Gnofract 4D Fractal Generator
 +Name[pl]=Generator fraktali Gnofract 4D
  Comment=Generate fractal images such as the Mandelbrot set
 +Comment[pl]=Generowanie obrazów fraktali takich jak zbiór Mandelbrota
  Exec=gnofract4d %F
- Icon=gnofract4d-logo.png
+ Icon=gnofract4d
  Terminal=false
  Type=Application
 -Categories=GNOME;Graphics;Math;
 +Categories=GTK;Graphics;
  MimeType=text/x-gnofract4d-fractal-parameters
--
--
 +# vi: encoding=utf-8
diff --git a/gnofract4d-libpng.patch b/gnofract4d-libpng.patch
deleted file mode 100644
index c53aa37..0000000
--- a/gnofract4d-libpng.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnofract4d-3.11/fract4d/c/imageIO.cpp~	2007-07-04 05:50:02.000000000 +0200
-+++ gnofract4d-3.11/fract4d/c/imageIO.cpp	2010-02-16 16:16:44.744627806 +0100
-@@ -119,7 +119,7 @@
- 	info_ptr = png_create_info_struct(png_ptr);
- 	if(NULL == info_ptr)
- 	{
--	    png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+	    png_destroy_write_struct(&png_ptr, NULL);
- 	    return;
- 	}
- 
-@@ -312,7 +312,7 @@
- 	info_ptr = png_create_info_struct(png_ptr);
- 	if (info_ptr == NULL)
- 	{
--	    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+	    png_destroy_read_struct(&png_ptr, NULL, NULL);
- 	    return;
- 	}
- 
-@@ -325,7 +325,7 @@
- 	//printf("shutdown\n");
- 	if(ok)
- 	{
--	    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+	    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 	}
-     }
- 
-@@ -351,7 +351,7 @@
-     
-     //printf("get IHDR\n");
-     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
--		 &interlace_type, int_p_NULL, int_p_NULL);
-+		 &interlace_type, NULL, NULL);
- 
-     //printf("set res(%d,%d)\n",width,height);
-     if(!im->set_resolution(width, height, -1, -1))
-@@ -372,7 +372,7 @@
- 	for (int y = 0; y < im->Yres(); y++)
- 	{
- 	    png_bytep row = (png_bytep)(im->getBuffer() + im->row_length() * y); 
--	    png_read_rows(png_ptr, &row, png_bytepp_NULL, 1);
-+	    png_read_rows(png_ptr, &row, NULL, 1);
- 	}
-     }
-     return true;
diff --git a/gnofract4d.spec b/gnofract4d.spec
index ba19b21..20f259d 100644
--- a/gnofract4d.spec
+++ b/gnofract4d.spec
@@ -1,22 +1,21 @@
 Summary:	gnofract4d - GNOME-based program to draw fractals
 Summary(pl.UTF-8):	gnofract4d - program do rysowania fraktali pod GNOME
 Name:		gnofract4d
-Version:	3.11
-Release:	8
+Version:	4.3
+Release:	1
 License:	BSD
 Group:		X11/Applications/Graphics
-Source0:	http://dl.sourceforge.net/gnofract4d/%{name}-%{version}.tar.gz
-# Source0-md5:	c038702003c47fe58b7db1023302b855
-URL:		http://gnofract4d.sourceforge.net/
+Source0:	https://github.com/fract4d/gnofract4d/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	d815353c682eab9787e2fdad26f625ba
+URL:		https://fract4d.github.io/gnofract4d/
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-libpng.patch
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel >= 2.2
-BuildRequires:	python-modules
+BuildRequires:	python3-devel
+BuildRequires:	python3-modules
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
-Requires:	python-pygtk-gtk >= 1:2.0
+Requires:	python3-pygobject3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,23 +33,17 @@ tego samego, czterowymiarowego obiektu fraktalnego.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 sed -i -e "s#/usr/lib/%{name}-%{version}#%{_libdir}/%{name}-%{version}#g" \
 	setup.cfg gnofract4d
 
-CFLAGS="%{rpmcflags}" \
-	python setup.py build
+%py3_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-python setup.py install \
-	--root=$RPM_BUILD_ROOT \
-	--optimize=2
-
-%find_lang %{name} --with-gnome
+%py3_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,13 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 %update_desktop_database_post
 %update_mime_database
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%doc COPYING README
+%doc LICENSE README.md
 %attr(755,root,root) %{_bindir}/*
-%{py_sitedir}/*fract*
+%{py3_sitedir}/*fract*
 %{_datadir}/%{name}
 %{_datadir}/mime/packages/*
-%{_pixmapsdir}/gnofract4d
-%{_pixmapsdir}/gnofract4d-logo.png
+%{_pixmapsdir}/gnofract4d.png
 %{_desktopdir}/gnofract4d.desktop
+%{_iconsdir}/hicolor/*x*/apps/gnofract4d.png