2009-03-07 Andras Barna <[email protected]>
authorsartek
Sat, 07 Mar 2009 12:22:19 +0000
changeset 1719 7c905d664fd9
parent 1718 9564cde7fc53
child 1720 8131cabd4fe0
2009-03-07 Andras Barna <[email protected]> * SFEpidgin-musictracker.spec: bump version * SFErecordmysolaris-gtk.spec: bump version * SFErecordmysolaris.spec: bump version * patches/pidgin-musictracker-01-solaris.diff: rework
ChangeLog
SFEpidgin-musictracker.spec
SFErecordmysolaris-gtk.spec
SFErecordmysolaris.spec
patches/pidgin-musictracker-01-solaris.diff
--- a/ChangeLog	Fri Mar 06 09:16:45 2009 +0000
+++ b/ChangeLog	Sat Mar 07 12:22:19 2009 +0000
@@ -1,3 +1,10 @@
+2009-03-07  Andras Barna  <[email protected]>
+
+	* SFEpidgin-musictracker.spec: bump version
+	* SFErecordmysolaris-gtk.spec: bump version
+	* SFErecordmysolaris.spec: bump version
+	* patches/pidgin-musictracker-01-solaris.diff: rework
+
 2009-03-06  Alfred Peng  <[email protected]>
 
 	* SFEcoherence.spec, SFEpython24-coherence.spec, base-specs/coherence.spec:
--- a/SFEpidgin-musictracker.spec	Fri Mar 06 09:16:45 2009 +0000
+++ b/SFEpidgin-musictracker.spec	Sat Mar 07 12:22:19 2009 +0000
@@ -7,7 +7,7 @@
 Name:                    SFEpidgin-musictracker
 Summary:                 Now playing plugin for pidgin
 Group:                   System/GUI/GNOME
-Version:                 0.4.11
+Version:                 0.4.16
 Source:                  http://pidgin-musictracker.googlecode.com/files/pidgin-musictracker-%{version}.tar.bz2
 Patch1:                  pidgin-musictracker-01-solaris.diff
 SUNW_BaseDir:            %{_basedir}
@@ -35,10 +35,11 @@
 
 touch README
 
-aclocal
-automake -a -f
-autoconf -f
+#aclocal -I m4
+#automake -a -f
+#autoconf -f
 
+./reconf
 
 ./configure --prefix=%{_prefix} \
             --mandir=%{_mandir} \
@@ -47,6 +48,7 @@
             --infodir=%{_infodir} \
             --sysconfdir=%{_sysconfdir} \
             --datadir=%{_datadir} \
+            --disable-werror
 
 make -j$CPUS
 
--- a/SFErecordmysolaris-gtk.spec	Fri Mar 06 09:16:45 2009 +0000
+++ b/SFErecordmysolaris-gtk.spec	Sat Mar 07 12:22:19 2009 +0000
@@ -7,7 +7,7 @@
 
 Name:                SFErecordmysolaris-gtk
 Summary:             Recordmysolaris-gtk - Desktop recording tool, gtk frontend
-Version:             0.1
+Version:             0.2
 Source:              http://recordmysolaris.googlecode.com/files/gtk-recordmysolaris-%{version}.tar.gz
 URL:                 http://code.google.com/p/recordmysolaris/
 
@@ -31,7 +31,7 @@
 %define pythonver 2.4
 
 %prep
-%setup -q -n gtk-recordmysolaris-%version
+%setup -q -n gtk-recordmysolaris
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -112,5 +112,7 @@
 
 
 %changelog
+* Sat Mar 07 2009 - ([email protected])
+- new version
 * Mon Aug 25 2008 - ([email protected])
 - Initial spec
--- a/SFErecordmysolaris.spec	Fri Mar 06 09:16:45 2009 +0000
+++ b/SFErecordmysolaris.spec	Sat Mar 07 12:22:19 2009 +0000
@@ -7,7 +7,7 @@
 
 Name:                SFErecordmysolaris
 Summary:             Recordmysolaris - Desktop recording tool
-Version:             0.1
+Version:             0.2
 Source:              http://recordmysolaris.googlecode.com/files/recordmysolaris-%{version}.tar.gz
 URL:                 http://code.google.com/p/recordmysolaris/
 
@@ -15,9 +15,9 @@
 BuildRoot:           %{_tmppath}/%{name}_%{version}-build
 BuildRequires:            SUNWogg-vorbis
 BuildRequires:            SUNWlibtheora
-BuildRequires:            oss
+BuildRequires:            /usr/include/sys/soundcard.h
 
-Requires:            oss
+Requires:            /usr/include/sys/soundcard.h
 Requires:            SUNWxwplt
 Requires:            SUNWogg-vorbis
 Requires:            SUNWlibtheora
@@ -25,7 +25,7 @@
 %include default-depend.inc
 
 %prep
-%setup -q -n recordmysolaris-%version
+%setup -q -n recordmysolaris
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -69,5 +69,7 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Mar 07 2009 - ([email protected])
+- new version
 * Mon Aug 25 2008 - ([email protected])
 - Initial spec
--- a/patches/pidgin-musictracker-01-solaris.diff	Fri Mar 06 09:16:45 2009 +0000
+++ b/patches/pidgin-musictracker-01-solaris.diff	Sat Mar 07 12:22:19 2009 +0000
@@ -1,34 +1,34 @@
-diff -Naur pidgin-musictracker-0.4.11.old/src/Makefile.am pidgin-musictracker-0.4.11/src/Makefile.am
---- pidgin-musictracker-0.4.11.old/src/Makefile.am	2008-10-28 19:37:36.736299539 +0200
-+++ pidgin-musictracker-0.4.11/src/Makefile.am	2008-10-28 19:39:03.965615653 +0200
-@@ -36,8 +36,6 @@
- 
+--- pidgin-musictracker-0.4.16/src/Makefile.am.old	2009-03-07 11:50:40.570421185 +0200
++++ pidgin-musictracker-0.4.16/src/Makefile.am	2009-03-07 11:51:43.859862568 +0200
+@@ -42,8 +42,7 @@
  AM_CPPFLAGS = \
          -DDATADIR=\"$(PIDGIN_DATADIR)\" \
--	-Werror -W -Wall -Wno-unused-parameter \
+ 	-DLOCALEDIR=\"$(localedir)\" \
+-	$(WERROR_CFLAGS) -W -Wall -Wno-unused-parameter \
 -	-std=gnu99 \
++	$(WERROR_CFLAGS) \
          $(PIDGIN_CFLAGS) \
          $(GLIB_CFLAGS) \
  		$(GTK_CFLAGS) \
-diff -Naur pidgin-musictracker-0.4.11.old/src/Makefile.in pidgin-musictracker-0.4.11/src/Makefile.in
---- pidgin-musictracker-0.4.11.old/src/Makefile.in	2008-10-28 19:37:36.741721549 +0200
-+++ pidgin-musictracker-0.4.11/src/Makefile.in	2008-10-28 19:39:22.279453020 +0200
-@@ -240,8 +240,6 @@
- musictracker_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS)
+--- pidgin-musictracker-0.4.16/src/Makefile.in.old	2009-03-07 11:51:57.973830553 +0200
++++ pidgin-musictracker-0.4.16/src/Makefile.in	2009-03-07 11:52:42.076543323 +0200
+@@ -267,8 +267,7 @@
  AM_CPPFLAGS = \
          -DDATADIR=\"$(PIDGIN_DATADIR)\" \
--	-Werror -W -Wall -Wno-unused-parameter \
+ 	-DLOCALEDIR=\"$(localedir)\" \
+-	$(WERROR_CFLAGS) -W -Wall -Wno-unused-parameter \
 -	-std=gnu99 \
++	$(WERROR_CFLAGS)
          $(PIDGIN_CFLAGS) \
          $(GLIB_CFLAGS) \
  		$(GTK_CFLAGS) \
-diff -Naur pidgin-musictracker-0.4.11.old/src/musictracker.c pidgin-musictracker-0.4.11/src/musictracker.c
---- pidgin-musictracker-0.4.11.old/src/musictracker.c	2008-10-28 19:37:36.745567028 +0200
-+++ pidgin-musictracker-0.4.11/src/musictracker.c	2008-10-29 03:03:51.461376140 +0200
-@@ -236,7 +236,13 @@
+--- pidgin-musictracker-0.4.16/src/musictracker.c.old	2009-03-07 11:53:02.791621799 +0200
++++ pidgin-musictracker-0.4.16/src/musictracker.c	2009-03-07 11:53:51.786585501 +0200
+@@ -214,8 +214,13 @@
+ 	buf[10] = 0;
  	status = put_field(status, 'b', buf);
  
-         // Music symbol: U+266B 'beamed eighth notes'
+-        // Music symbol: U+266B 'beamed eighth notes'
 -	status = put_field(status, 'm', "\u266b");
 +        char symbol[4];
 +        symbol[0] = 0xE2;
@@ -40,22 +40,9 @@
  
  	trace("Formatted status: %s", status);
  
-diff -Naur pidgin-musictracker-0.4.11.old/src/utils.h pidgin-musictracker-0.4.11/src/utils.h
---- pidgin-musictracker-0.4.11.old/src/utils.h	2008-10-28 19:37:36.736001356 +0200
-+++ pidgin-musictracker-0.4.11/src/utils.h	2008-10-28 19:39:43.253980951 +0200
-@@ -2,7 +2,7 @@
- #define _UTILS_H_
- 
- #include <stdio.h>
--#include <pcre.h>
-+#include <pcre/pcre.h>
- 
- #ifndef WIN32
- #include <dbus/dbus-glib.h>
-diff -Naur pidgin-musictracker-0.4.11.old/src/xmmsctrl.c pidgin-musictracker-0.4.11/src/xmmsctrl.c
---- pidgin-musictracker-0.4.11.old/src/xmmsctrl.c	2008-10-28 19:37:36.741332515 +0200
-+++ pidgin-musictracker-0.4.11/src/xmmsctrl.c	2008-10-28 23:04:08.704020563 +0200
-@@ -72,9 +72,9 @@
+--- pidgin-musictracker-0.4.16/src/xmmsctrl.c.old	2009-03-07 11:54:10.758787842 +0200
++++ pidgin-musictracker-0.4.16/src/xmmsctrl.c	2009-03-07 11:55:38.619789241 +0200
+@@ -76,9 +76,9 @@
  			}
  
                          char regexp[100];
@@ -67,3 +54,14 @@
                          pcre_free(re);
  		}
  
+--- pidgin-musictracker-0.4.16/src/utils.h.old	2009-03-07 12:16:06.309532150 +0200
++++ pidgin-musictracker-0.4.16/src/utils.h	2009-03-07 12:16:11.625132535 +0200
+@@ -2,7 +2,7 @@
+ #define _UTILS_H_
+ 
+ #include <stdio.h>
+-#include <pcre.h>
++#include <pcre/pcre.h>
+ 
+ #ifndef WIN32
+ #include <dbus/dbus-glib.h>