rpms/incollector/F-12 incollector-1.2-pixmaps-install.patch, NONE, 1.1 incollector-fixlib.patch, NONE, 1.1 incollector.spec, 1.7, 1.8

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/incollector/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12932

Modified Files:
	incollector.spec 
Added Files:
	incollector-1.2-pixmaps-install.patch incollector-fixlib.patch 
Log Message:
pushed release for missing patch tag


incollector-1.2-pixmaps-install.patch:
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE incollector-1.2-pixmaps-install.patch ---
Only install .png files to pixmaps/ and skip .ico.

diff -up incollector-1.2/Makefile.am.pixmaps incollector-1.2/Makefile.am
--- Makefile.am.pixmaps	2009-01-11 19:46:51.000000000 +0200
+++ Makefile.am	2009-12-03 13:03:01.000000000 +0200
@@ -45,7 +45,7 @@ install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d $(srcdir)/pixmaps; then \
 	  $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \
-	  for pixmap in $(srcdir)/pixmaps/*; do \
+	  for pixmap in $(srcdir)/pixmaps/*.png; do \
 	    if test -f $$pixmap; then \
 	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/; \
 	    fi \
@@ -55,7 +55,7 @@ install-data-local:
 dist-hook:
 	if test -d pixmaps; then \
 	  mkdir $(distdir)/pixmaps; \
-	  for pixmap in pixmaps/*; do \
+	  for pixmap in pixmaps/*.png; do \
 	    if test -f $$pixmap; then \
 	      cp -p $$pixmap $(distdir)/pixmaps; \
 	    fi \
diff -up incollector-1.2/Makefile.in.pixmaps incollector-1.2/Makefile.in
--- Makefile.in.pixmaps	2009-12-03 13:04:34.000000000 +0200
+++ Makefile.in	2009-12-03 13:04:46.000000000 +0200
@@ -672,7 +672,7 @@ install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d $(srcdir)/pixmaps; then \
 	  $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \
-	  for pixmap in $(srcdir)/pixmaps/*; do \
+	  for pixmap in $(srcdir)/pixmaps/*.png; do \
 	    if test -f $$pixmap; then \
 	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/; \
 	    fi \
@@ -682,7 +682,7 @@ install-data-local:
 dist-hook:
 	if test -d pixmaps; then \
 	  mkdir $(distdir)/pixmaps; \
-	  for pixmap in pixmaps/*; do \
+	  for pixmap in pixmaps/*.png; do \
 	    if test -f $$pixmap; then \
 	      cp -p $$pixmap $(distdir)/pixmaps; \
 	    fi \

incollector-fixlib.patch:
 script.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE incollector-fixlib.patch ---
--- script.in.orig	2009-12-01 15:55:50.000000000 +0200
+++ script.in	2009-12-01 15:56:23.000000000 +0200
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @MONO@ @prefix@/lib/incollector/incollector.exe $MONO_EXTRA_ARGS "$@"
+exec @MONO@ @pkglibdir@/incollector.exe $MONO_EXTRA_ARGS "$@"


Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-12/incollector.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- incollector.spec	8 Dec 2009 10:31:44 -0000	1.7
+++ incollector.spec	25 Jan 2010 10:22:29 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           incollector
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Information collector
 Group:          Applications/Productivity
 License:        GPLv2
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Jan 25 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.2-4
+- pushed release for missing tag the pixmaps patch
+
 * Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
 - Changed the license to GPLv2
 - Added pixmaps-install.patch