rpms/nedit/devel nedit.spec,1.12,1.13

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	nedit.spec 
Log Message:
spec cleanup



Index: nedit.spec
===================================================================
RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nedit.spec	23 Aug 2007 07:13:53 -0000	1.12
+++ nedit.spec	26 Oct 2007 13:50:12 -0000	1.13
@@ -1,11 +1,7 @@
-%define desktop_file 1
-%if %{desktop_file}
-%define desktop_file_utils_version 0.2.93
-%endif
-Summary: A GUI text editor for systems with X and Motif.
+Summary: A GUI text editor for systems with X
 Name: nedit
 Version: 5.5
-Release: 12%{?dist}
+Release: 13%{?dist}
 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2
 Source1: nedit.desktop
 Source2: nedit-icon.png
@@ -22,12 +18,10 @@
 Requires: lesstif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: lesstif-devel, libXau-devel, libXpm-devel, libXmu-devel
-%if %{desktop_file}
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
-%endif
+BuildRequires: desktop-file-utils
 
 %description
-NEdit is a GUI text editor for the X Window System and Motif. NEdit is
+NEdit is a GUI text editor for the X Window System. NEdit is
 very easy to use, especially if you are familiar with the
 Macintosh(TM) or Microsoft(TM) Windows(TM) style of interface.
 
@@ -59,7 +53,7 @@
 
 mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/applnk/Applications
-%if %{desktop_file}
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/applications
@@ -67,7 +61,6 @@
         --dir $RPM_BUILD_ROOT%{_prefix}/share/applications \
         --add-category "Application;Development;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Applications/nedit.desktop
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,19 +70,18 @@
 %doc doc/nedit.doc README ReleaseNotes
 %{_mandir}/*/*
 %{_bindir}/*
-%if %{desktop_file}
 %{_prefix}/share/applications/*
 %{_datadir}/pixmaps/nedit-icon.png
-%else
-%config /etc/X11/applnk/Applications/nedit.desktop
-%endif
 
 %changelog
-* Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 5.6-12
+* Fri Oct 26 2007 Jindrich Novy <jnovy at redhat.com> 5.5-13
+- spec cleanup
+
+* Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 5.5-12
 - update License
 - rebuild for BuildID
 
-* Mon Jan  8 2007 Jindrich Novy <jnovy at redhat.com> 5.6-11
+* Mon Jan  8 2007 Jindrich Novy <jnovy at redhat.com> 5.5-11
 - explicitly depend on lesstif to avoid nedit crashes
   (binary lesstif/openmotif incompatibilities) (#221535)
 - fix buildroot