From e783b9d496aca86d607640264a972d97ad15e647 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Aug 25 2007 21:01:20 +0000
Subject: Updated to 1.5-1 in devel.

Modified Files: .cvsignore gnome-password-generator.spec sources Removed
    Files: gnome-password-generator-1.4-desktop.patch

---

diff --git a/.cvsignore b/.cvsignore
index 123a961..91e73dc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-password-generator-1.4.tar.gz
+gnome-password-generator-1.5.tar.gz
diff --git a/gnome-password-generator-1.4-desktop.patch b/gnome-password-generator-1.4-desktop.patch
deleted file mode 100644
index 989f593..0000000
--- a/gnome-password-generator-1.4-desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urNp gnome-password-generator-1.4.orig/gnome-password-generator.desktop gnome-password-generator-1.4/gnome-password-generator.desktop
---- gnome-password-generator-1.4.orig/gnome-password-generator.desktop	2007-08-01 05:06:39.000000000 +0530
-+++ gnome-password-generator-1.4/gnome-password-generator.desktop	2007-08-01 05:11:47.000000000 +0530
-@@ -1,9 +1,9 @@
- [Desktop Entry]
- Name=Password Generator
- Comment=Generate various types of passwords
--Icon=gnome-password-generator.png
-+Icon=gnome-password-generator
- Exec=gnome-password-generator
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Utility;
-+Categories=GNOME;Utility;
diff --git a/gnome-password-generator.spec b/gnome-password-generator.spec
index 2e606d8..245ffeb 100644
--- a/gnome-password-generator.spec
+++ b/gnome-password-generator.spec
@@ -1,14 +1,12 @@
 Summary: Graphical secure password generator
 Name: gnome-password-generator
-Version: 1.4
-Release: 5%{dist}
-License: GPL
+Version: 1.5
+Release: 1%{dist}
+License: GPLv2+
 Group: Applications/System
 URL: http://gnome-password.sourceforge.net/
 Source0: http://downloads.sourceforge.net/gnome-password/%{name}-%{version}.tar.gz
 
-Patch0: %{name}-%{version}-desktop.patch
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: gnome-python2
@@ -27,7 +25,6 @@ length.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -35,12 +32,15 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # icon
 install -m0644 %{name}.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps
+install -m0644 %{name}.svg \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
 
 desktop-file-install --vendor gnome \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -67,9 +67,16 @@ fi
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/96x96/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Aug 22 2007 Debarshi Ray <rishi@fedoraproject.org> - 1.5-1
+- Version bump to 1.5.
+- Changed value of License according to Fedora licensing guidelines.
+- Place icon in SVG format under /usr/share/icons/hicolor/scalable/apps.
+- gnome-password-generator.desktop fixes added by upstream.
+
 * Wed Aug 01 2007 Debarshi Ray <rishi@fedoraproject.org> - 1.4-5
 - Removed Application from Categories.
 
diff --git a/sources b/sources
index 8c72fd0..840997b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2a043a93ce04f3bb798afded8bfd329  gnome-password-generator-1.4.tar.gz
+bc4995ee9ec1b084a9e03a35ab99c8e6  gnome-password-generator-1.5.tar.gz