rpms/dia/F-11 import.log, NONE, 1.1 .cvsignore, 1.6, 1.7 dia.spec, 1.40, 1.41 sources, 1.6, 1.7 dia-0.92.2-dtd.patch, 1.1, NONE dia-0.94-fallbacktoxpmicons.patch, 1.2, NONE dia-0.95-pre6-help.patch, 1.2, NONE dia-0.96-1-clocks.patch, 1.1, NONE dia-0.96-python-detect.patch, 1.1, NONE dia-0.96.1-64bit.patch, 1.1, NONE dia-0.96.1-desktop.patch, 1.1, NONE dia-0.96.1-plugins.patch, 1.1, NONE dia-0.96.1-pythonpath.patch, 1.1, NONE dia-0.96.1-svg-export.patch, 1.1, NONE

Huzaifa Sidhpurwala huzaifas at fedoraproject.org
Wed Aug 5 10:12:26 UTC 2009 

Author: huzaifas

Update of /cvs/pkgs/rpms/dia/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4742/F-11

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	import.log 
Removed Files:
	dia-0.92.2-dtd.patch dia-0.94-fallbacktoxpmicons.patch 
	dia-0.95-pre6-help.patch dia-0.96-1-clocks.patch 
	dia-0.96-python-detect.patch dia-0.96.1-64bit.patch 
	dia-0.96.1-desktop.patch dia-0.96.1-plugins.patch 
	dia-0.96.1-pythonpath.patch dia-0.96.1-svg-export.patch 
Log Message:
version update



--- NEW FILE import.log ---
dia-0_97-1_fc10:F-11:dia-0.97-1.fc10.src.rpm:1249452748


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Jun 2007 08:22:46 -0000	1.6
+++ .cvsignore	5 Aug 2009 10:12:25 -0000	1.7
@@ -1 +1 @@
-dia-0.96.1.tar.bz2
+dia-0.97.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/dia.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- dia.spec	31 Mar 2009 05:18:11 -0000	1.40
+++ dia.spec	5 Aug 2009 10:12:26 -0000	1.41
@@ -1,24 +1,14 @@
 Name:           dia
-Version:        0.96.1
-Release:        17%{?dist}
+Version:        0.97
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.96/%{name}-%{version}.tar.bz2
-Patch1:         dia-0.92.2-dtd.patch
-Patch2:         dia-0.95-pre6-help.patch
-Patch3:         dia-0.94-fallbacktoxpmicons.patch
-Patch4:         dia-0.96-python-detect.patch
-Patch5:         dia-0.96.1-64bit.patch
-Patch6:         dia-0.96.1-desktop.patch
-Patch7:         dia-0.96.1-svg-export.patch
-Patch8:		dia-0.96.1-plugins.patch
-Patch9:		dia-0.96.1-pythonpath.patch
-Patch10:        dia-0.96-1-clocks.patch
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:  libgnomeui-devel pygtk2-devel desktop-file-utils python-devel
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -33,16 +23,6 @@ and can export to PostScript(TM).
 
 %prep
 %setup -q
-%patch1 -p1 -b .dtd
-%patch2 -p1 -b .help
-%patch3 -p1 -b .fallbacktoxpmicons
-%patch4 -p1 -b .py-detect
-%patch5 -p1 -b .64bit
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1 -b .orig
-%patch9 -p1 -b .pythonpath
-%patch10 -p1 -b .clock
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -60,10 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %name
 
-# stop rpmlint from complaining
-chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/python/gtkcons.py \
-  $RPM_BUILD_ROOT%{_datadir}/%{name}/python/doxrev.py
-
 # Since we're not using the cairo stuff, but a stub plugin still
 # gets built, Dia complains it doesn't have an init function.  So
 # kill the plugin
@@ -74,13 +50,9 @@ desktop-file-install --vendor fedora  --
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --remove-category Application                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -113,10 +85,15 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime-info/*
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/omf/%{name}/*.omf
 
 
 %changelog
+* Fri Jul 24 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.97-1
+- update to 0.97
+- drop old patches
+
 * Tue Mar 31 2009 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 1:0.96.1-17
 - Resolves: rhbz#486726
 - Version bump


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dia/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Jun 2007 08:22:46 -0000	1.6
+++ sources	5 Aug 2009 10:12:26 -0000	1.7
@@ -1 +1 @@
-7b81b22baa2df55efe4845865dddc7b6  dia-0.96.1.tar.bz2
+3d11f9aaa5a4923f0a5533962c87bdfb  dia-0.97.tar.bz2


--- dia-0.92.2-dtd.patch DELETED ---


--- dia-0.94-fallbacktoxpmicons.patch DELETED ---


--- dia-0.95-pre6-help.patch DELETED ---


--- dia-0.96-1-clocks.patch DELETED ---


--- dia-0.96-python-detect.patch DELETED ---


--- dia-0.96.1-64bit.patch DELETED ---


--- dia-0.96.1-desktop.patch DELETED ---


--- dia-0.96.1-plugins.patch DELETED ---


--- dia-0.96.1-pythonpath.patch DELETED ---


--- dia-0.96.1-svg-export.patch DELETED ---

More information about the scm-commits mailing list