rpms/metapixel/devel metapixel-makefile.patch, NONE, 1.1 metapixel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Andreas Thienemann (ixs)]

Author: ixs

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

Modified Files:
	.cvsignore sources 
Added Files:
	metapixel-makefile.patch metapixel.spec 
Log Message:
auto-import metapixel-1.0.1-2 on branch devel from metapixel-1.0.1-2.src.rpm

metapixel-makefile.patch:

--- NEW FILE metapixel-makefile.patch ---
--- metapixel-1.0.1/Makefile.makefile	2006-02-19 22:30:56.000000000 +0100
+++ metapixel-1.0.1/Makefile	2006-04-26 04:18:27.000000000 +0200
@@ -1,9 +1,9 @@
-PREFIX = /usr/local
+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
 
@@ -46,12 +46,13 @@
 	$(CC) $(CCOPTS) -c $<
 
 install : metapixel metapixel.1
-	$(INSTALL) -d $(BINDIR)
-	$(INSTALL) metapixel $(BINDIR)
-	$(INSTALL) metapixel-prepare $(BINDIR)
-	$(INSTALL) metapixel.1 $(MANDIR)/man1
-	$(INSTALL) metapixel-imagesize $(BINDIR)
-	$(INSTALL) metapixel-sizesort $(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) metapixel $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel-prepare $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) metapixel-imagesize $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel-sizesort $(DESTDIR)$(BINDIR)
 
 clean :
 	rm -f *.o metapixel convert metapixel-imagesize *~


--- NEW FILE metapixel.spec ---
Summary: A Photomosaic Generator
Name: metapixel
Version: 1.0.1
Release: 2%{?dist}
License: GPL
Group: Applications/Multimedia
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/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, zlib-devel

%description
Metapixel is a program for generating photomosaics. It can generate
classical photomosaics, in which the source image is viewed as a matrix
of equally sized rectangles for each of which a matching image is
substitued, as well as collage-style photomosaics, in which rectangular
parts of the source image at arbitrary positions (i.e. not aligned to a
matrix) are substituted by matching images.

%prep
%setup -q
%patch0 -p1 -b .makefile

%build
%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
chmod 644 %{buildroot}%{_mandir}/man1/metapixel.1*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/metapixel
%{_bindir}/metapixel-prepare
%{_bindir}/metapixel-imagesize
%{_bindir}/metapixel-sizesort
%{_mandir}/man1/metapixel.1.gz


%changelog
* Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-2
- Fixed manpage perms

* Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-1
- Updated to 1.0.1-1

* Thu Aug 25 2005 Andreas Thienemann <andreas at bawue.net> 1.0.0-1
- Initial spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metapixel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 16:03:56 -0000	1.1
+++ .cvsignore	26 Apr 2006 16:04:33 -0000	1.2
@@ -0,0 +1 @@
+metapixel-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metapixel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 16:03:56 -0000	1.1
+++ sources	26 Apr 2006 16:04:34 -0000	1.2
@@ -0,0 +1 @@
+b0fcb1ad62708478478218190c355fd0  metapixel-1.0.1.tar.gz