commit pngtoico for openSUSE:Factory
Hello community,
here is the log from the commit of package pngtoico for openSUSE:Factory
checked in at 2012-01-09 11:17:05
Comparing /work/SRC/openSUSE:Factory/pngtoico (Old)
and /work/SRC/openSUSE:Factory/.pngtoico.new (New)
Package is "pngtoico", Maintainer is "pgaj...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/pngtoico/pngtoico.changes2011-12-25
17:40:06.0 +0100
+++ /work/SRC/openSUSE:Factory/.pngtoico.new/pngtoico.changes 2012-01-09
11:17:08.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 5 13:33:24 UTC 2012 - pgaj...@suse.com
+
+- build also with libpng15
+ * libpng15.patch
+
+---
New:
pngtoico-libpng15.patch
Other differences:
--
++ pngtoico.spec ++
--- /var/tmp/diff_new_pack.Qf9uz7/_old 2012-01-09 11:17:08.0 +0100
+++ /var/tmp/diff_new_pack.Qf9uz7/_new 2012-01-09 11:17:08.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pngtoico
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -25,6 +25,9 @@
Source0:%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE pngtoico-makefile.patch -- adjusts path and linkage
Patch0: %{name}-makefile.patch
+# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgaj...@suse.com; build with
libpng15; sent today to h...@zytor.com
+# build against libpng14 should not be affected, otherwise please let me know
+Patch1: %{name}-libpng15.patch
BuildRequires: libpng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,6 +38,7 @@
%prep
%setup -q
%patch0
+%patch1 -p1
%build
make CFLAGS="%{optflags}"
++ pngtoico-libpng15.patch ++
Index: pngtoico-1.0.1/pngtoico.c
===
--- pngtoico-1.0.1.orig/pngtoico.c
+++ pngtoico-1.0.1/pngtoico.c
@@ -188,7 +188,7 @@ read_png(const char *file)
goto perrexit;
}
- if ( setjmp(png_ptr->jmpbuf) ) {
+ if ( setjmp(png_jmpbuf(png_ptr)) ) {
fprintf(stderr, "%s: PNG format error\n", file);
goto errexit;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pngtoico for openSUSE:Factory
Hello community,
here is the log from the commit of package pngtoico for openSUSE:Factory
checked in at 2011-12-25 17:39:57
Comparing /work/SRC/openSUSE:Factory/pngtoico (Old)
and /work/SRC/openSUSE:Factory/.pngtoico.new (New)
Package is "pngtoico", Maintainer is "pgaj...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/pngtoico/pngtoico.changes2011-12-13
11:49:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.pngtoico.new/pngtoico.changes 2011-12-25
17:40:06.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 21 10:31:44 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---
Other differences:
--
++ pngtoico.spec ++
--- /var/tmp/diff_new_pack.KMHiDo/_old 2011-12-25 17:40:07.0 +0100
+++ /var/tmp/diff_new_pack.KMHiDo/_new 2011-12-25 17:40:07.0 +0100
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: pngtoico
Version:1.0.1
Release:0
@@ -36,7 +35,6 @@
%prep
%setup -q
%patch0
-%{?suse_update_config:%{suse_update_config -f}}
%build
make CFLAGS="%{optflags}"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pngtoico for openSUSE:Factory
Hello community,
here is the log from the commit of package pngtoico for openSUSE:Factory
checked in at 2011-12-13 11:49:14
Comparing /work/SRC/openSUSE:Factory/pngtoico (Old)
and /work/SRC/openSUSE:Factory/.pngtoico.new (New)
Package is "pngtoico", Maintainer is "pgaj...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/pngtoico/pngtoico.changes2011-09-23
12:41:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.pngtoico.new/pngtoico.changes 2011-12-13
11:49:17.0 +0100
@@ -1,0 +2,5 @@
+Thu Dec 8 13:05:45 UTC 2011 - co...@suse.com
+
+- looks like GPL-2.0+
+
+---
Other differences:
--
++ pngtoico.spec ++
--- /var/tmp/diff_new_pack.C6DDPj/_old 2011-12-13 11:49:20.0 +0100
+++ /var/tmp/diff_new_pack.C6DDPj/_new 2011-12-13 11:49:20.0 +0100
@@ -16,14 +16,13 @@
#
-
Name: pngtoico
Version:1.0.1
-Release:131
-License:GPL
+Release:0
Summary:Utility to convert PNG images to Microsoft ICO format
-Url:http://www.kernel.org/pub/software/graphics/pngtoico/
+License:GPL-2.0+
Group: Productivity/Graphics/Convertors
+Url:http://www.kernel.org/pub/software/graphics/pngtoico/
Source0:%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE pngtoico-makefile.patch -- adjusts path and linkage
Patch0: %{name}-makefile.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit pngtoico for openSUSE:Factory
Hello community,
here is the log from the commit of package pngtoico for openSUSE:Factory
checked in at Mon May 9 10:37:55 CEST 2011.
New Changes file:
--- /dev/null 2010-08-26 16:28:41.0 +0200
+++ /mounts/work_src_done/STABLE/pngtoico/pngtoico.changes 2011-04-30
19:32:17.0 +0200
@@ -0,0 +1,46 @@
+---
+Sat Apr 30 17:31:53 UTC 2011 - ma...@marix.org
+
+- cleaned up spec file
+
+---
+Fri Feb 24 17:17:07 CET 2006 - lmichno...@suse.cz
+
+- update to version 1.0.1
+ Update fixes only legal issue [#152758]
+
+---
+Wed Jan 25 21:40:28 CET 2006 - m...@suse.de
+
+- converted neededforbuild to BuildRequires
+
+---
+Tue Jan 17 22:32:23 CET 2006 - sch...@suse.de
+
+- Don't strip binaries.
+
+---
+Wed Nov 2 21:41:03 CET 2005 - dmuel...@suse.de
+
+- don't build as root
+
+---
+Thu Jun 16 16:10:59 CEST 2005 - meiss...@suse.de
+
+- use RPM_OPT_FLAGS correctly.
+
+---
+Mon Jan 13 16:06:13 CET 2003 - r...@suse.de
+
+- also add -lm
+
+---
+Thu Jul 4 02:15:06 CEST 2002 - r...@suse.de
+
+- add -lz for libpng
+
+---
+Wed Apr 17 17:59:07 CEST 2002 - pre...@suse.cz
+
+- first version of this packge (version 1.0)
+
calling whatdependson for head-i586
New:
pngtoico-1.0.1.tar.bz2
pngtoico-makefile.patch
pngtoico.changes
pngtoico.spec
Other differences:
--
++ pngtoico.spec ++
#
# spec file for package pngtoico
#
# Copyright (c) 2011 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: pngtoico
Version:1.0.1
Release:131
License:GPL
Summary:Utility to convert PNG images to Microsoft ICO format
Url:http://www.kernel.org/pub/software/graphics/pngtoico/
Group: Productivity/Graphics/Convertors
Source0:%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE pngtoico-makefile.patch -- adjusts path and linkage
Patch0: %{name}-makefile.patch
BuildRequires: libpng-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
pngtoico is a small utility to convert a set of PNG images to Microsoft
ICO format. Supports transparency.
%prep
%setup -q
%patch0
%{?suse_update_config:%{suse_update_config -f}}
%build
make CFLAGS="%{optflags}"
%install
make "INSTALLROOT=%{buildroot}" install
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc %{_mandir}/man1/pngtoico.1.gz
%{_bindir}/pngtoico
%changelog
++ pngtoico-makefile.patch ++
--- Makefile
+++ Makefile
@@ -15,15 +15,15 @@
##
INSTALLROOT =
-prefix = /usr/local
+prefix = /usr
bindir = $(prefix)/bin
-mandir = $(prefix)/man
+mandir = $(prefix)/share/man
man1dir = $(mandir)/man1
CC = gcc -W -Wall
CFLAGS = -O2 -fomit-frame-pointer
-LDFLAGS = -s
-LIBS= -lpng
+LDFLAGS =
+LIBS= -lpng -lz -lm
INSTALL = install
INSTALL_EXEC = $(INSTALL) -c -m 755
INSTALL_DATA = $(INSTALL) -c -m 644
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
