rpms/metapixel/devel .cvsignore, 1.2, 1.3 metapixel-makefile.patch, 1.2, 1.3 metapixel.spec, 1.5, 1.6 sources, 1.2, 1.3

[Andreas Thienemann (ixs)]

Author: ixs

Update of /cvs/pkgs/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2622

Modified Files:
	.cvsignore metapixel-makefile.patch metapixel.spec sources 
Log Message:
* Fri Aug 31 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.2-1
- New upstream release 1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/metapixel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Apr 2006 16:04:33 -0000	1.2
+++ .cvsignore	31 Aug 2007 18:56:51 -0000	1.3
@@ -1 +1 @@
-metapixel-1.0.1.tar.gz
+metapixel-1.0.2.tar.gz

metapixel-makefile.patch:

Index: metapixel-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/metapixel/devel/metapixel-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metapixel-makefile.patch	21 May 2006 22:38:38 -0000	1.2
+++ metapixel-makefile.patch	31 Aug 2007 18:56:51 -0000	1.3
@@ -1,34 +1,34 @@
---- metapixel-1.0.1/Makefile.makefile	2006-02-19 22:30:56.000000000 +0100
-+++ metapixel-1.0.1/Makefile	2006-05-22 00:35:49.000000000 +0200
-@@ -1,21 +1,18 @@
+diff -up metapixel-1.0.2/Makefile.makefile metapixel-1.0.2/Makefile
+--- metapixel-1.0.2/Makefile.makefile	2006-12-10 18:59:54.000000000 +0100
++++ metapixel-1.0.2/Makefile	2007-08-31 20:47:48.000000000 +0200
+@@ -1,4 +1,4 @@
 -PREFIX = /usr/local
-+PREFIX = /usr
++PREFIX = /usr/
  INSTALL = install
  MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
  
- BINDIR = $(PREFIX)/bin
--MANDIR = $(PREFIX)/man
-+MANDIR = $(PREFIX)/share/man
- 
- VERSION = 1.0.1
+@@ -8,7 +8,7 @@ MANDIR = $(PREFIX)/share/man
+ VERSION = 1.0.2
  
  #DEBUG = -g
 -OPTIMIZE = -O2
 +#OPTIMIZE = -O2
  #PROFILE = -pg
  
--MACOS_LDOPTS = -L/sw/lib
--MACOS_CCOPTS = -I/sw/include
--
+ MACOS_LDOPTS = -L/sw/lib
+@@ -16,8 +16,8 @@ MACOS_CCOPTS = -I/sw/include
+ 
+ FORMATDEFS = -DRWIMG_JPEG -DRWIMG_PNG -DRWIMG_GIF
+ 
 -LDOPTS = $(MACOS_LDOPTS) -L/usr/X11R6/lib $(PROFILE) $(DEBUG)
--CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
-+LDOPTS = -L/usr/X11R6/lib $(LDFLAGS) $(PROFILE) $(DEBUG) 
-+CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Wall $(OPTIMIZE) $(DEBUG) $(CFLAGS) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+-CCOPTS = $(MACOS_CCOPTS) -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I. -Irwimg -Wall $(OPTIMIZE) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
++LDOPTS = $(PROFILE) $(DEBUG) $(LFLAGS)
++CCOPTS = -I. -Irwimg -Wall $(OPTIMIZE) $(CFLAGS) $(DEBUG) $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
  CC = gcc
  #LIBFFM = -lffm
  
-@@ -46,12 +43,13 @@
- 	$(CC) $(CCOPTS) -c $<
+@@ -52,12 +52,13 @@ librwimg :
+ 	$(MAKE) -C rwimg
  
  install : metapixel metapixel.1
 -	$(INSTALL) -d $(BINDIR)


Index: metapixel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metapixel/devel/metapixel.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metapixel.spec	8 Sep 2006 17:38:28 -0000	1.5
+++ metapixel.spec	31 Aug 2007 18:56:51 -0000	1.6
@@ -1,12 +1,12 @@
 Summary: A Photomosaic Generator
 Name: metapixel
-Version: 1.0.1
-Release: 5%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
-Source0: http://www.complang.tuwien.ac.at/~schani/metapixel/metapixel-%{version}.tar.gz
+Source0: http://www.complang.tuwien.ac.at/schani/metapixel/metapixel-%{version}.tar.gz
 Patch0: metapixel-makefile.patch
-URL: http://www.complang.tuwien.ac.at/~schani/metapixel/
+URL: http://www.complang.tuwien.ac.at/schani/metapixel/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, zlib-devel
 
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Andreas Thienemann <andreas at bawue.net> - 1.0.2-1
+- New upstream release 1.0.2
+
 * Fri Sep 08 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.1-5
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/metapixel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Apr 2006 16:04:34 -0000	1.2
+++ sources	31 Aug 2007 18:56:51 -0000	1.3
@@ -1 +1 @@
-b0fcb1ad62708478478218190c355fd0  metapixel-1.0.1.tar.gz
+af5d77d38826756af213a08e3ada9941  metapixel-1.0.2.tar.gz