- 7.5, placed perl stuff (just packaged), adjusted autotools regeneration

[packages/urxvt.git] / urxvt.spec

diff --git a/urxvt.spec b/urxvt.spec
index 1d055f20727d76acb10f072b57f9b6363f8cd840..a1741f863f79ec8a9587ec72b25165b5419b57be 100644 (file)
--- a/urxvt.spec
+++ b/urxvt.spec
@@ -1,19 +1,22 @@
+%include       /usr/lib/rpm/macros.perl
 Summary:       Rxvt terminal with unicode support and some improvements
 Summary(pl):   Terminal Rxvt z obs³ug± unicode i kilkoma usprawnieniami
 Name:          urxvt
-Version:       5.3
-Release:       1
+Version:       7.5
+Release:       0.1
 Group:         X11/Applications
 License:       GPL
 Source0:       http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-%{version}.tar.bz2
-# Source0-md5: 1a5372a40d728c8a50e059b5d826490e
+# Source0-md5: 41b8b19da031846c6a60bf8f36a16fd7
 Source1:       %{name}.desktop
-Patch0:                %{name}-libname.patch
-URL:           http://software.schmorp.de
+Patch0:                %{name}-link.patch
+URL:           http://software.schmorp.de/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildRequires: sed >= 4.0
 BuildRequires: xft-devel
 Requires:      terminfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,16 +37,11 @@ URxvt jest modyfikacj
 
 %prep
 %setup -q -n rxvt-unicode-%{version}
-#%patch0 -p1 
+%patch0 -p1
 
 %build
-mv -f autoconf/{configure.in,xpm.m4} .
-#CFLAGS="%{rpmcflags} -DLINUX_KEYS"
-%{__libtoolize}
-%{__aclocal} -I .
 %{__autoheader}
 %{__autoconf}
-%{__automake} || :
 %configure \
        --enable-shared \
        --disable-static \
@@ -58,12 +56,15 @@ mv -f autoconf/{configure.in,xpm.m4} .
        --enable-smart-resize \
        --enable-256-color \
        --enable-24bit
-%{__make}
+%{__make} \
+       CXXFLAGS="%{rpmcxxflags}" \
+       CFLAGS="%{rpmcxxflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_mandir}/man{1,7}
 
+echo $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -79,7 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/menu/* Changes doc/README.*
+%doc Changes doc/README.*
 %attr(755,root,root) %{_bindir}/*
+%{_libdir}/%{name}
 %{_desktopdir}/urxvt.desktop
 %{_mandir}/man*/*