dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: vigra
-# $Id$
-NAME := vigra
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-ea91f2fb4212a21d708aced277e6e85a  vigra1.4.0.tar.gz
+5713de4ebfe29e1b5fa9689af76b8a90  vigra1.5.0.tar.gz

vigra.spec

@@ -1,7 +1,7 @@
 Summary: Generic Programming for Computer Vision
 Name: vigra
-Version: 1.4.0
-Release: 4%{?dist}
+Version: 1.5.0
+Release: 2%{?dist}
 License: MIT
 Group: Development/Libraries
 Source: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz
@@ -28,10 +28,11 @@ programs that use the vigra library.
 
 %prep
 %setup -q -n %{name}%{version}
-chmod 644 %{_builddir}/vigra1.4.0/doc/vigra/documents/*.ps
-rm -f %{_builddir}/vigra1.4.0/doc/vigra/.cvsignore
+chmod 644 %{_builddir}/%{name}%{version}/doc/vigra/documents/*.ps
+rm -f %{_builddir}/%{name}%{version}/doc/vigra/.cvsignore
 
 %build
+export CXXFLAGS="$RPM_OPT_FLAGS"
 ./configure \
     --prefix=/usr \
     --with-tiff \
@@ -58,7 +59,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root,-)
-%doc LICENSE README
+%doc LICENSE.txt README.txt
 %{_libdir}/libvigraimpex.so.*
 
 %files devel
@@ -69,6 +70,10 @@ rm -rf %{buildroot}
 %doc doc/vigra/*
 
 %changelog
+* Mon Feb 19 2007 Bruno Postle <bruno@postle.net> 1.5.0-2
+  - update to 1.5.0 release
+  - fix bug 228926: vigra: $RPM_OPT_FLAGS not used
+
 * Tue Sep 12 2006 Bruno Postle <bruno@postle.net> 1.4.0-4
   - remove gcc-c++ dependency