rpms/techtalk-pse/F-13 patch-1.0.0-ensure-display-of-labels.diff, NONE, 1.1 techtalk-pse.spec, 1.1, 1.2

[Ian Weller]

Author: ianweller

Update of /cvs/pkgs/rpms/techtalk-pse/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32046

Modified Files:
	techtalk-pse.spec 
Added Files:
	patch-1.0.0-ensure-display-of-labels.diff 
Log Message:
Add patch-1.0.0-ensure-display-of-labels.diff


patch-1.0.0-ensure-display-of-labels.diff:
 techtalk-pse.pl |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE patch-1.0.0-ensure-display-of-labels.diff ---
diff -up techtalk-pse-1.0.0/techtalk-pse.pl.orig techtalk-pse-1.0.0/techtalk-pse.pl
--- techtalk-pse-1.0.0/techtalk-pse.pl.orig	2010-06-21 14:31:25.562944751 -0400
+++ techtalk-pse-1.0.0/techtalk-pse.pl	2010-06-21 14:31:38.711667883 -0400
@@ -424,6 +424,7 @@ sub make_button_bar
     my %params = @_;
 
     my $bbox = Gtk2::Toolbar->new ();
+    $bbox->set_style ("GTK_TOOLBAR_TEXT");
 
     my $i = 0;
 


Index: techtalk-pse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/techtalk-pse/F-13/techtalk-pse.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- techtalk-pse.spec	14 Jun 2010 16:46:15 -0000	1.1
+++ techtalk-pse.spec	21 Jun 2010 19:52:12 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           techtalk-pse
 Version:        1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Presentation software designed for technical people
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://annexia.org/techtalk
 Source0:        http://annexia.org/_file/%{name}-%{version}.tar.gz
+# From upstream, https://bugzilla.redhat.com/show_bug.cgi?id=601408#c9
+Patch0:         patch-1.0.0-ensure-display-of-labels.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -29,6 +31,7 @@ Tech Talk PSE is bad at slide effects, c
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -37,12 +40,12 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -53,6 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 21 2010 Ian Weller <iweller at redhat.com> - 1.0.0-3
+- New patch: patch-1.0.0-ensure-display-of-labels.diff
+  "There's a problem in 1.0.0 [upstream] that labels
+  are not displayed with certain versions of perl-Gtk2."
+  This patch resolves this issue.
+- Go totally OCD and change the RPM build root macros
+
 * Tue Jun  8 2010 Ian Weller <iweller at redhat.com> - 1.0.0-2
 - Include examples
 - Use macros in source URL