openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package png2ico

--- png2ico.changes.orig
+++ png2ico.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Mon Nov 11 08:53:23 UTC 2024 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Use %patch -P to fix building on Tumbleweed
+
+-------------------------------------------------------------------
+Mon Jul  5 13:00:07 UTC 2021 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Fix building on openSUSE Tumbleweed
+
+-------------------------------------------------------------------
 Wed Dec 11 12:17:14 UTC 2013 - opensuse@dstoecker.de
 
 - fix build for 13.1 and better
--- png2ico.spec.orig
+++ png2ico.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package png2ico
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,13 +22,15 @@ Release:        0
 Summary:        PNG to icon converter
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Other
-Source:         %{name}-src-2002-12-08.tar.bz2
-Patch:          png2ico_include.patch
 Url:            http://www.winterdrache.de/freeware/png2ico/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         %{name}-src-2002-12-08.tar.bz2
+Patch0:         png2ico-boost.patch
+Patch1:         png2ico_include.patch
+BuildRequires:  boost-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
 BuildRequires:  make
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Converts PNG files to Windows icon resource files. If you're looking for a program
@@ -45,20 +47,20 @@ a command like the following:
 
 %prep
 %setup -q -n png2ico
-%patch -p1
+%if %suse_version < 1550
+%patch -P0 -p1
+%endif
+%patch -P1 -p1
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
-%__install -m 755 -d ${RPM_BUILD_ROOT}%{_bindir}
-%__install -m 755 %{name} %{buildroot}%{_bindir}/
-%__install -m 755 -d ${RPM_BUILD_ROOT}%{_mandir}/man1/
+install -m 755 -d %{buildroot}%{_bindir}
+install -m 755 %{name} %{buildroot}%{_bindir}/
+install -m 755 -d %{buildroot}%{_mandir}/man1/
 gzip doc/%{name}.1
-%__install -m 0644 doc/%{name}.1.gz %{buildroot}%{_mandir}/man1/
-
-%clean
-%__rm -rf "%{buildroot}"
+install -m 0644 doc/%{name}.1.gz %{buildroot}%{_mandir}/man1/
 
 %files
 %defattr(-,root,root)

Places

File project.diff of Package png2ico

Places