rpms/dia/devel dia-0.95-pre6-help.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 dia.spec, 1.6, 1.7 sources, 1.1, 1.2 dia-0.94-gcc4.patch, 1.1, NONE dia-0.94-gnomeflags.patch, 1.1, NONE dia-0.94-help.patch, 1.2, NONE dia-0.94-rh165337.patch, 1.1, NONE dia-0.94-svgimport-fix.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Mar 31 18:15:44 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16446

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	dia-0.95-pre6-help.patch 
Removed Files:
	dia-0.94-gcc4.patch dia-0.94-gnomeflags.patch 
	dia-0.94-help.patch dia-0.94-rh165337.patch 
	dia-0.94-svgimport-fix.patch 
Log Message:
* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-0.pre7.1
- Taking over as FE maintainer (bz 185886)
- Cleanup spec to match FE packaging guidelines
- Bump to upstream 0.95-pre7 (bz 184548)
- Enable python plugin


dia-0.95-pre6-help.patch:

--- NEW FILE dia-0.95-pre6-help.patch ---
--- dia-0.95-pre6/app/commands.c.help	2006-01-27 18:48:45.000000000 +0100
+++ dia-0.95-pre6/app/commands.c	2006-03-22 16:37:25.000000000 +0100
@@ -526,7 +526,7 @@
   const char *dentry;
   GError *error = NULL;
 
-  helpdir = dia_get_data_directory("help");
+  helpdir = g_strdup ("/usr/share/gnome/help/dia");
   if (!helpdir) {
     message_warning(_("Could not find help directory"));
     return;
@@ -554,11 +554,11 @@
 			      G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
       if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
 	helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
       }
 #else
       helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
 #endif
       bestscore = score;
     }
@@ -575,7 +575,7 @@
   ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
 #else
   command = getenv("BROWSER");
-  command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex);
+  command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex);
   system(command);
   g_free(command);
 #endif
--- dia-0.95-pre6/doc/en/dia.xml.help	2006-03-22 16:33:12.000000000 +0100
+++ dia-0.95-pre6/doc/en/dia.xml	2006-03-22 16:33:13.000000000 +0100
@@ -5,7 +5,7 @@
 <!DOCTYPE book
 
   PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
   [
 
     <!ENTITY VERSION "0.95-pre6">


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2005 10:54:39 -0000	1.1
+++ .cvsignore	31 Mar 2006 18:15:44 -0000	1.2
@@ -1 +1 @@
-dia-0.94.tar.bz2
+dia-0.95-pre7.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dia.spec	3 Jan 2006 14:17:55 -0000	1.6
+++ dia.spec	31 Mar 2006 18:15:44 -0000	1.7
@@ -1,40 +1,23 @@
-%define pango_version 1.1.5
-%define freetype_version 2.0.9
-%define libxml2_version 2.3.9
-
 Name: 		dia
-Summary:	A diagram drawing program.
-Version:	0.94
-Release:	19
+Version:	0.95
+%define pre     pre7
+Release:	0.%{pre}.1%{?dist}
 Epoch:		1
-Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
+Summary:	A diagram drawing program.
 Group:		Applications/Multimedia
 License:	GPL
-URL:		http://www.lysator.liu.se/~alla/dia/
+URL:		http://www.gnome.org/projects/dia/
+Source:		ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-%{pre}.tar.bz2
+Patch1:         dia-0.92.2-dtd.patch
+Patch2:         dia-0.95-pre6-help.patch
+Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires:	libxml2 >= %{libxml2_version}, pango >= %{pango_version}
-Requires:	glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt
-Requires:	scrollkeeper, freetype >= %{freetype_version}
+BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
+BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
 Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
 Requires(post): /usr/bin/scrollkeeper-update
 Requires(postun): /usr/bin/scrollkeeper-update
 
-BuildRequires:	libxml2-devel >= %{libxml2_version}, intltool > 0.21
-BuildRequires:	pango-devel >= %{pango_version}
-BuildRequires:	freetype-devel >= %{freetype_version}
-BuildRequires:	glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel
-BuildRequires:	docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl
-BuildRequires:	openjade, libpng-devel, automake17, libart_lgpl-devel, 
-BuildRequires:  libxslt-devel, libgnome-devel
-
-Patch0: dia-0.94-svgimport-fix.patch
-Patch1: dia-0.92.2-dtd.patch
-Patch2: dia-0.94-help.patch
-Patch3: dia-0.94-gcc4.patch
-Patch4: dia-0.94-fallbacktoxpmicons.patch
-Patch5: dia-0.94-rh165337.patch
-Patch6: dia-0.94-gnomeflags.patch
-
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
 program.  Dia can be used to draw different types of diagrams, and
@@ -43,29 +26,20 @@
 save diagrams to a custom file format, can load and save in .xml format,
 and can export to PostScript(TM).
 
-%prep
-%setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .svgimportfix
+%prep
+%setup -q -n %{name}-%{version}-%{pre}
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
-%patch3 -p1 -b .gcc4
-%patch4 -p1 -b .fallbacktoxpmicons
-%patch5 -p1 -b .rh165337
-%patch6 -p1 -b .gnomeflags
+%patch3 -p1 -b .fallbacktoxpmicons
+#rm doc/*/dia.1
+
 
 %build
-rm doc/*/dia.1
-aclocal-1.7
-libtoolize --force
-automake-1.7
-autoconf
-%configure --enable-gnome --enable-db2html --with-cairo=no
-
-export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0`
-export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0`
-CFLAGS=$RPM_OPT_FLAGS make
+%configure --enable-gnome --enable-db2html --with-python
+make %{?_smp_mflags}
  
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -94,15 +68,18 @@
 # kill the plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
 
+
 %post
 scrollkeeper-update
 
 %postun
 scrollkeeper-update
 
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd
@@ -116,7 +93,14 @@
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/*
 
+
 %changelog
+* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-0.pre7.1
+- Taking over as FE maintainer (bz 185886)
+- Cleanup spec to match FE packaging guidelines
+- Bump to upstream 0.95-pre7 (bz 184548)
+- Enable python plugin
+
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-19
 - make buildable
 
@@ -312,6 +296,3 @@
 
 * Wed Apr 28 1999 Preston Brown <pbrown at redhat.com>
 - initial build for Powertools 6.0
-
-
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2005 10:54:39 -0000	1.1
+++ sources	31 Mar 2006 18:15:44 -0000	1.2
@@ -1 +1 @@
-63584224912dab49fed8d2cf87ea2d85  dia-0.94.tar.bz2
+c0b982162764933da17fdbfa9695408b  dia-0.95-pre7.tar.bz2


--- dia-0.94-gcc4.patch DELETED ---


--- dia-0.94-gnomeflags.patch DELETED ---


--- dia-0.94-help.patch DELETED ---


--- dia-0.94-rh165337.patch DELETED ---


--- dia-0.94-svgimport-fix.patch DELETED ---




More information about the fedora-extras-commits mailing list