rpms/ekg2/devel ekg2-rpm.patch,1.3,1.4 ekg2.spec,1.11,1.12

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Wed May 28 20:46:47 UTC 2008 

Author: rathann

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

Modified Files:
	ekg2-rpm.patch ekg2.spec 
Log Message:
- fix some rpmlint issues


ekg2-rpm.patch:

Index: ekg2-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2-rpm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ekg2-rpm.patch	28 May 2008 18:26:39 -0000	1.3
+++ ekg2-rpm.patch	28 May 2008 20:46:03 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up ekg2-0.2-rc1/plugins/perl/Makefile.am.r ekg2-0.2-rc1/plugins/perl/Makefile.am
 --- ekg2-0.2-rc1/plugins/perl/Makefile.am.r	2008-02-28 21:22:59.000000000 +0100
-+++ ekg2-0.2-rc1/plugins/perl/Makefile.am	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/plugins/perl/Makefile.am	2008-05-28 20:19:20.000000000 +0200
 @@ -16,7 +16,7 @@ all-local:
  	for dir in $(perl_dirs); do \
  	 cd $$dir && \
@@ -12,7 +12,7 @@
  	 cd ..; \
 diff -up ekg2-0.2-rc1/plugins/ioctld/Makefile.am.r ekg2-0.2-rc1/plugins/ioctld/Makefile.am
 --- ekg2-0.2-rc1/plugins/ioctld/Makefile.am.r	2008-02-28 21:23:01.000000000 +0100
-+++ ekg2-0.2-rc1/plugins/ioctld/Makefile.am	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/plugins/ioctld/Makefile.am	2008-05-28 20:19:20.000000000 +0200
 @@ -9,7 +9,7 @@ libdir = $(plugindir)
  libexec_PROGRAMS = ioctld
  ioctld_SOURCES = ioctld.c ioctld.h
@@ -24,7 +24,7 @@
  	mkdir -p  $(DESTDIR)$(pkgdatadir)/plugins/ioctld/
 diff -up ekg2-0.2-rc1/plugins/ncurses/Makefile.am.r ekg2-0.2-rc1/plugins/ncurses/Makefile.am
 --- ekg2-0.2-rc1/plugins/ncurses/Makefile.am.r	2008-02-28 21:22:53.000000000 +0100
-+++ ekg2-0.2-rc1/plugins/ncurses/Makefile.am	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/plugins/ncurses/Makefile.am	2008-05-28 20:19:20.000000000 +0200
 @@ -9,6 +9,7 @@ ncurses_la_CPPFLAGS = $(C_FVISIBILITY) $
  
  libdir = $(plugindir)
@@ -35,7 +35,7 @@
  	mkdir -p $(DESTDIR)$(pkgdatadir)/plugins/ncurses/
 diff -up ekg2-0.2-rc1/docs/ekg2book/sheet.xsl.r ekg2-0.2-rc1/docs/ekg2book/sheet.xsl
 --- ekg2-0.2-rc1/docs/ekg2book/sheet.xsl.r	2008-02-28 21:23:01.000000000 +0100
-+++ ekg2-0.2-rc1/docs/ekg2book/sheet.xsl	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/docs/ekg2book/sheet.xsl	2008-05-28 20:19:20.000000000 +0200
 @@ -4,7 +4,7 @@
     <!-- xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl"/ -->
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" />
@@ -47,7 +47,19 @@
  </xsl:stylesheet>
 diff -up ekg2-0.2-rc1/docs/ekg2book/Makefile.r ekg2-0.2-rc1/docs/ekg2book/Makefile
 --- ekg2-0.2-rc1/docs/ekg2book/Makefile.r	2008-02-28 21:23:01.000000000 +0100
-+++ ekg2-0.2-rc1/docs/ekg2book/Makefile	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/docs/ekg2book/Makefile	2008-05-28 20:19:20.000000000 +0200
+@@ -3,7 +3,7 @@ XSLTRANSFORMER="xsltproc"
+ all:
+ 	rm -rf book
+ 	./generate.sh
+-	$(XSLTRANSFORMER) -stringparam chunker.output.encoding ISO-8859-2 sheet.xsl book.xml
++	$(XSLTRANSFORMER) -stringparam chunker.output.encoding UTF-8 sheet.xsl book.xml
+ 	mkdir book
+ 	mv *.html book/
+ 
+diff -up ekg2-0.2-rc1/docs/ekg2book-en/Makefile.r ekg2-0.2-rc1/docs/ekg2book-en/Makefile
+--- ekg2-0.2-rc1/docs/ekg2book-en/Makefile.r	2008-02-28 21:23:01.000000000 +0100
++++ ekg2-0.2-rc1/docs/ekg2book-en/Makefile	2008-05-28 22:44:48.000000000 +0200
 @@ -3,7 +3,7 @@ XSLTRANSFORMER="xsltproc"
  all:
  	rm -rf book
@@ -59,7 +71,7 @@
  
 diff -up ekg2-0.2-rc1/contrib/perl/xmms.pl.r ekg2-0.2-rc1/contrib/perl/xmms.pl
 --- ekg2-0.2-rc1/contrib/perl/xmms.pl.r	2008-02-28 21:23:02.000000000 +0100
-+++ ekg2-0.2-rc1/contrib/perl/xmms.pl	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/contrib/perl/xmms.pl	2008-05-28 20:19:20.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env perl
  # XMMS-InfoPipe front-end - allow /np [dest]
@@ -67,7 +79,7 @@
  #   Thanks to ak for suggestions and even changes.
 diff -up ekg2-0.2-rc1/contrib/perl/slownik.pl.r ekg2-0.2-rc1/contrib/perl/slownik.pl
 --- ekg2-0.2-rc1/contrib/perl/slownik.pl.r	2008-02-28 21:23:02.000000000 +0100
-+++ ekg2-0.2-rc1/contrib/perl/slownik.pl	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/contrib/perl/slownik.pl	2008-05-28 20:19:20.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env perl
  # YDP Dictionary bot based on socket, Michal 'GiM' Spadlinski
@@ -75,7 +87,7 @@
  # 
 diff -up ekg2-0.2-rc1/contrib/perl/dns.pl.r ekg2-0.2-rc1/contrib/perl/dns.pl
 --- ekg2-0.2-rc1/contrib/perl/dns.pl.r	2008-02-28 21:23:02.000000000 +0100
-+++ ekg2-0.2-rc1/contrib/perl/dns.pl	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/contrib/perl/dns.pl	2008-05-28 20:19:20.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env perl
  # /DNS <nick>|<host>|<ip> ...
@@ -83,7 +95,7 @@
  use Ekg2;
 diff -up ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl.r ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl
 --- ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl.r	2008-02-28 21:23:02.000000000 +0100
-+++ ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl	2008-05-28 20:19:20.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env perl
  # Audioscrobbler BOT
@@ -91,7 +103,7 @@
  # 12-12-2005
 diff -up ekg2-0.2-rc1/contrib/perl/ggbe.pl.r ekg2-0.2-rc1/contrib/perl/ggbe.pl
 --- ekg2-0.2-rc1/contrib/perl/ggbe.pl.r	2008-02-28 21:23:02.000000000 +0100
-+++ ekg2-0.2-rc1/contrib/perl/ggbe.pl	2008-05-28 19:50:28.000000000 +0200
++++ ekg2-0.2-rc1/contrib/perl/ggbe.pl	2008-05-28 20:19:20.000000000 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env perl
  # Michal 'GiM' Spadlinski


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ekg2.spec	28 May 2008 20:36:53 -0000	1.11
+++ ekg2.spec	28 May 2008 20:46:03 -0000	1.12
@@ -251,6 +251,8 @@
 
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
 
+rm $RPM_BUILD_ROOT%{_datadir}/ekg2/plugins/jabber/jabber_handlers*.c
+
 %find_lang %{name}
 
 %clean

More information about the fedora-extras-commits mailing list