rpms/gtkdatabox/devel .cvsignore, 1.10, 1.11 gtkdatabox.spec, 1.18, 1.19 sources, 1.10, 1.11

[Eric Work]

Author: ework

Update of /cvs/pkgs/rpms/gtkdatabox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2615

Modified Files:
	.cvsignore gtkdatabox.spec sources 
Log Message:
Update to gtkdatabox 0.9.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	9 Sep 2008 03:35:27 -0000	1.10
+++ .cvsignore	10 Feb 2010 08:38:34 -0000	1.11
@@ -1 +1 @@
-gtkdatabox-0.9.0.1.tar.gz
+gtkdatabox-0.9.1.1.tar.gz


Index: gtkdatabox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/gtkdatabox.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- gtkdatabox.spec	25 Jul 2009 01:43:37 -0000	1.18
+++ gtkdatabox.spec	10 Feb 2010 08:38:34 -0000	1.19
@@ -1,14 +1,15 @@
 Name:           gtkdatabox
-Version:        0.9.0.1
-Release:        3%{?dist}
+Version:        0.9.1.1
+Release:        1%{?dist}
 Summary:        GTK+ widget for fast data display
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://www.eudoxos.net/gtk/gtkdatabox
-Source:         http://www.eudoxos.net/gtk/gtkdatabox/download/%{name}-%{version}.tar.gz
+URL:            http://sourceforge.net/projects/gtkdatabox
+Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         gtkdatabox-0.8.2.0-userpmoptflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk2-devel, libglade2-devel, pkgconfig
+BuildRequires:  gtk2-devel, pkgconfig
+BuildRequires:  libglade2-devel, glade3-libgladeui-devel
 
 %description
 GtkDatabox is a widget for the GTK+ library designed to display
@@ -18,27 +19,49 @@ large amounts of numerical data fast and
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       gtk2-devel, libglade2-devel, pkgconfig
+Requires:       gtk2-devel, pkgconfig
 
 %description    devel
-The %{name}-devel package contains libraries, header files, and documentation
-for developing applications that use %{name}.
+The %{name}-devel package contains libraries, header files, and
+documentation for developing applications that use %{name}.
+
+%package        libglade
+Summary:        Glade 2 support files for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    libglade
+The %{name}-libglade package contains support files for libglade.
+
+%package        glade
+Summary:        Glade 3 support files for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    glade
+The %{name}-glade package contains support files for glade.
 
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
 
 %build
-%configure --disable-static --enable-libglade
+%configure --disable-static --disable-rpath \
+    --enable-libglade --enable-glade LIBS="-lm"
+# fix rpath libtool issues
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# fix ChangeLog encoding issues
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.tmp && mv -f ChangeLog.tmp ChangeLog
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -47,7 +70,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_libdir}/libgtkdatabox-*.so.*
-%{_libdir}/libglade/2.0/libdatabox.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -55,9 +77,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gtkdatabox*.h
 %{_libdir}/libgtkdatabox.so
 %{_libdir}/pkgconfig/gtkdatabox.pc
-%{_datadir}/gtk-doc/html/gtkdatabox/
+%{_datadir}/gtk-doc/html/gtkdatabox
+
+%files libglade
+%defattr(-,root,root,-)
+%{_libdir}/libglade/2.0/libdatabox.so
+
+%files glade
+%defattr(-,root,root,-)
+%{_libdir}/glade3/modules/libgladedatabox.so
+%{_datadir}/glade3/catalogs/gtkdatabox.xml
 
 %changelog
+* Tue Feb 09 2010 Eric Work <work.eric at gmail.com> 0.9.1.1-1
+- new upstream version
+- enable glade support
+- fix new linker problems
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtkdatabox/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	9 Sep 2008 03:35:27 -0000	1.10
+++ sources	10 Feb 2010 08:38:35 -0000	1.11
@@ -1 +1 @@
-cb62ac3ab2ddafa6cb1bcd3a55a1cc88  gtkdatabox-0.9.0.1.tar.gz
+910921da2198ebd02ea8a7eb622916ce  gtkdatabox-0.9.1.1.tar.gz