- fixed usage of macros

- added/removed neccesary/obsolete patches
- FHS 2.0 compliance where needed
- gzipping docs where needed

Changed files:
    gnotepad+.spec -> 1.7

diff --git a/gnotepad+.spec b/gnotepad+.spec
index 17386947d9e2750eef43f7fb6ab77c3bd6d8ffbb..01e5516e2c15e8eb581451cb0581ac17d82a537d 100644 (file)
--- a/gnotepad+.spec
+++ b/gnotepad+.spec
@@ -1,20 +1,17 @@
-%define name gnotepad+
-%define version 1.1.3
-%define release 1
-%define prefix /usr
-
-Summary: Simple but versatile editor for X11.
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Group: Applications/Editors
-Copyright: Freely distributable
-Url: http://members.xoom.com/ackahn/gnp
-Source: %{name}-%{version}.tar.gz
-Source1: gnotepad+.desktop
+Summary:       Simple but versatile editor for X11.
+Name:          gnotepad+
+Version:       1.1.2
+Release:       1
+Group:         Applications/Editors
+Copyright:     Freely distributable
+Url:           http://members.xoom.com/ackahn/gnp
+Source:                %{name}-%{version}.tar.gz
+Source1:       gnotepad+.desktop
 BuildRoot:     /tmp/%{name}-%{version}-root
-Requires: gtk+ >= 1.1.13 glib >= 1.1.13
+Requires:      gtk+ >= 1.1.13 glib >= 1.1.13
+
+%define                _prefix /usr/X11R6
+%define                _mandir /usr/X11R6/man
 
 %description
 gnotepad+ is an easy-to-use, yet fairly feature-rich, simple text editor
@@ -23,32 +20,35 @@ bloat as possible, while still providing many of the common features found
 in a modern GUI-based text editor.
 
 %prep
-%setup
+%setup -q
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
 ./configure %{_target_platform} \
-       --prefix=%{prefix} \
+       --prefix=%{_prefix} \
        --disable-gnome
 make
 
 %install
-if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_prefix}
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
+
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications
+install -c %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications
 
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/gnome/apps/Applications
-install -c -m 664 %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/share/gnome/apps/Applications
+strip $RPM_BUILD_ROOT/%{_bindir}/* || :
 
-# strip binaries
-strip `file $RPM_BUILD_ROOT/%{prefix}/bin/* | awk -F':' '/executable/ { print $1 }'`
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* AUTHORS NEWS README TODO ChangeLog
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %files
-%doc AUTHORS NEWS README TODO ChangeLog
-%attr(755,root,root) %{prefix}/bin/gnp
-%{prefix}/man/man1/gnp.1
-%{prefix}/share/gnome/apps/Applications/gnotepad+.desktop
-%{prefix}/share/gnotepad+
+%defattr(644,root,root,755)
+%doc {AUTHORS,NEWS,README,TODO,ChangeLog}.gz
+%attr(755,root,root) %{_bindir}/gnp
+%{_mandir}/man1/*
+%{_datadir}/gnome/apps/Applications/gnotepad+.desktop
+%{_datadir}/gnotepad+