rpms/dia/FC-5 dia-0.95-pre6-help.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 dia.spec, 1.8, 1.9 sources, 1.1, 1.2 dia-0.94-CVE-2006-1550.patch, 1.1, NONE 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
Tue Apr 25 20:04:06 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/dia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22365
Modified Files:
.cvsignore dia.spec sources
Added Files:
dia-0.95-pre6-help.patch
Removed Files:
dia-0.94-CVE-2006-1550.patch 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:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
drop unneeded scrollkeeper-update in scripts (bz 189756)
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/FC-5/.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 25 Apr 2006 20:04:06 -0000 1.2
@@ -1 +1 @@
-dia-0.94.tar.bz2
+dia-0.95.tar.bz2
Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dia.spec 31 Mar 2006 21:52:11 -0000 1.8
+++ dia.spec 25 Apr 2006 20:04:06 -0000 1.9
@@ -1,40 +1,18 @@
-%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: 21
+Version: 0.95
+Release: 1%{?dist}
Epoch: 1
-Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
+Summary: Diagram drawing program
Group: Applications/Multimedia
License: GPL
-URL: http://www.lysator.liu.se/~alla/dia/
+URL: http://www.gnome.org/projects/dia/
+Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.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}
-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
-Patch7: dia-0.94-CVE-2006-1550.patch
+BuildRequires: intltool libgnomeui-devel python-devel pygtk2-devel
+BuildRequires: docbook-utils docbook-style-dsssl docbook-style-xsl
%description
The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -44,48 +22,23 @@
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
%patch1 -p1 -b .dtd
%patch2 -p1 -b .help
-%patch3 -p1 -b .gcc4
-%patch4 -p1 -b .fallbacktoxpmicons
-%patch5 -p1 -b .rh165337
-%patch6 -p1 -b .gnomeflags
-%patch7 -p1 -b .cve
+%patch3 -p1 -b .fallbacktoxpmicons
+
%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
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-
-# We use a symlink to the desktop-menu-patches file instead.
-#desktop-file-install --vendor net --delete-original \
-# --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-# --add-category X-Red-Hat-Extra \
-# --add-category Office \
-# $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/dia.desktop
-
-rm $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
-# replace desktop file for -Base case
-
-ln -sf %{_datadir}/desktop-menu-patches/redhat-diagrams.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-diagrams.desktop
-
# remove scrollkeeper stuff we don't include in the package
rm -rf $RPM_BUILD_ROOT/var
@@ -96,15 +49,36 @@
# kill the plugin
rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
+# below is the desktop file and icon stuff.
+desktop-file-install --vendor fedora --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category X-Fedora \
+ --add-category Office \
+ $RPM_BUILD_ROOT%{_datadir}/applications/dia.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
+
+
%post
-scrollkeeper-update
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
%postun
-scrollkeeper-update
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
%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
@@ -113,18 +87,26 @@
%{_libdir}/dia
%{_mandir}/*/*
%{_datadir}/dia
-%{_datadir}/applications
+%{_datadir}/applications/fedora-dia.desktop
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
%{_datadir}/gnome/help/dia
+%dir %{_datadir}/mime-info
%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*.png
-%changelog
-* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.94-21
-- Fix CVE-2006-1550 (bz 187556)
-* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.94-20
-- Taking over as new FE maintainer
-- Rebuild for bz 185886
+%changelog
+* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
+- New upstream version 0.95 (final)
+- Cleanup spec even more, correctly install the desktop file and icons,
+ drop unneeded scrollkeeper-update in scripts (bz 189756)
+
+* 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
@@ -321,6 +303,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/FC-5/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 25 Apr 2006 20:04:06 -0000 1.2
@@ -1 +1 @@
-63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2
+d319921a91d4600df3578a4a64416393 dia-0.95.tar.bz2
--- dia-0.94-CVE-2006-1550.patch DELETED ---
--- 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 scm-commits
mailing list