Merge pull request #10 from toy/merge-later-changes

Merge later releases 1.89, 1.90, 1.91

Makefile.am

@@ -1,11 +1,11 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = foreign check-news
+AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src
 
 man_MANS = gifsicle.1 @OTHERMANS@
 
-EXTRA_DIST = COPYING README.md gifsicle.spec \
+EXTRA_DIST = COPYING README.md NEWS.md \
 	include/lcdf/clp.h include/lcdf/inttypes.h \
 	include/lcdfgif/gif.h include/lcdfgif/gifx.h \
 	gifsicle.1 gifview.1 gifdiff.1 logo.gif logo1.gif \
@@ -34,33 +34,8 @@ srclinks:
 
 versionize:
 	perl -pi -e "s/^\\.ds V.*/.ds V $(VERSION)/;" $(top_srcdir)/gifsicle.1 $(top_srcdir)/gifview.1 $(top_srcdir)/gifdiff.1
-	perl -pi -e "s/^Version:(\s+).*/Version:"'$$'"{1}$(VERSION)/; s/$(PACKAGE)-[\w.]+\.tar\.gz/$(PACKAGE)-$(VERSION).tar.gz/;" $(top_srcdir)/gifsicle.spec
 	perl -pi -e "s/gifsicle [\d.]+/gifsicle $(VERSION)/; s/VERSION \"[\w.]+/VERSION \"$(VERSION)/;" $(top_srcdir)/src/win32cfg.h
 
-rpm: dist
-	buildarch=`rpm --showrc | awk '/^build arch/ { print $$4; }'` ; \
-	mkdir -p /tmp/rpm-gfs/SOURCES /tmp/rpm-gfs/RPMS/$$buildarch \
-	/tmp/rpm-gfs/BUILD ; \
-	echo 'include: /usr/lib/rpm/rpmrc' > /tmp/rpm-gfs/rc ; \
-	echo 'macrofiles: /usr/lib/rpm/macros:/tmp/rpm-gfs/macros' >> /tmp/rpm-gfs/rc ; \
-	echo '%_topdir /tmp/rpm-gfs' > /tmp/rpm-gfs/macros ; \
-	cp logo1.gif $(PACKAGE)-$(VERSION).tar.gz /tmp/rpm-gfs/SOURCES ; \
-	rpmbuild --rcfile /tmp/rpm-gfs/rc -bb gifsicle.spec ; \
-	cp /tmp/rpm-gfs/RPMS/$$buildarch/*.rpm .
-	rm -rf /tmp/rpm-gfs
-
-rpm-ungif: dist
-	buildarch=`rpm --showrc | awk '/^build arch/ { print $$4; }'` ; \
-	mkdir -p /tmp/rpm-ugfs/SOURCES /tmp/rpm-ugfs/RPMS/$$buildarch \
-	/tmp/rpm-ugfs/BUILD ; \
-	echo 'include: /usr/lib/rpm/rpmrc' > /tmp/rpm-ugfs/rc ; \
-	echo 'macrofiles: /usr/lib/rpm/macros:/tmp/rpm-ugfs/macros' >> /tmp/rpm-ugfs/rc ; \
-	echo '%_topdir /tmp/rpm-ugfs' > /tmp/rpm-ugfs/macros ; \
-	cp logo1.gif $(PACKAGE)-$(VERSION).tar.gz /tmp/rpm-ugfs/SOURCES ; \
-	GIFSICLE_UNGIF=yes rpmbuild --rcfile /tmp/rpm-ugfs/rc -bb gifsicle.spec ; \
-	cp /tmp/rpm-ugfs/RPMS/$$buildarch/*.rpm `echo /tmp/rpm-ugfs/RPMS/$$buildarch/*.rpm | sed 's/.*gifsicle/ungifsicle/'`
-	rm -rf /tmp/rpm-ugfs
-
 dist-ungif: dist
 	$(AMTAR) xzf gifsicle-$(VERSION).tar.gz
 	@rm gifsicle-$(VERSION)/src/gifwrite.c