rpms/dia/devel .cvsignore,1.2,1.3 dia.spec,1.7,1.8 sources,1.2,1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore dia.spec sources 
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)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2006 18:15:44 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:56:20 -0000	1.3
@@ -1 +1 @@
-dia-0.95-pre7.tar.bz2
+dia-0.95.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dia.spec	31 Mar 2006 18:15:44 -0000	1.7
+++ dia.spec	25 Apr 2006 19:56:20 -0000	1.8
@@ -1,22 +1,18 @@
 Name: 		dia
 Version:	0.95
-%define pre     pre7
-Release:	0.%{pre}.1%{?dist}
+Release:	1%{?dist}
 Epoch:		1
-Summary:	A diagram drawing program.
+Summary:	Diagram drawing program
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.gnome.org/projects/dia/
-Source:		ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-%{pre}.tar.bz2
+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
 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
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -28,11 +24,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{pre}
+%setup -q
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
 %patch3 -p1 -b .fallbacktoxpmicons
-#rm doc/*/dia.1
 
 
 %build
@@ -44,20 +39,6 @@
 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
 
@@ -68,12 +49,30 @@
 # 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
@@ -88,13 +87,21 @@
 %{_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
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2006 18:15:44 -0000	1.2
+++ sources	25 Apr 2006 19:56:20 -0000	1.3
@@ -1 +1 @@
-c0b982162764933da17fdbfa9695408b  dia-0.95-pre7.tar.bz2
+d319921a91d4600df3578a4a64416393  dia-0.95.tar.bz2