[Xfce4-commits] <thunar:master> Remove spec file, rpm build and update libtool.

[Nick Schermer]

Updating branch refs/heads/master
         to add9df3e1945c4369a81260c74e45f1bed19788a (commit)
       from b41afa0c255c50d92025540fd072a642c2158d02 (commit)

commit add9df3e1945c4369a81260c74e45f1bed19788a
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 13 18:53:38 2011 +0100

    Remove spec file, rpm build and update libtool.

 Makefile.am     |    8 +-----
 Thunar.spec.in  |   70 -------------------------------------------------------
 configure.in.in |    7 ++---
 3 files changed, 4 insertions(+), 81 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 226de97..845e402 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,11 +29,7 @@ SUBDIRS =								\
 	plugins
 
 distclean-local:
-	rm -rf *.spec *.cache *~
-
-rpm: dist
-	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
-	@rm -f $(PACKAGE)-$(VERSION).tar.gz
+	rm -rf *.cache *~
 
 .PHONY: ChangeLog
 
@@ -90,7 +86,6 @@ EXTRA_DIST =								\
 	FAQ								\
 	HACKING								\
 	ThunarBulkRename.in						\
-	Thunar.spec.in							\
 	ThunarHelp.in							\
 	intltool-extract.in						\
 	intltool-merge.in						\
@@ -100,7 +95,6 @@ EXTRA_DIST =								\
 
 DISTCLEANFILES =							\
 	ThunarBulkRename						\
-	Thunar.spec							\
 	ThunarHelp							\
 	intltool-extract						\
 	intltool-merge							\
diff --git a/Thunar.spec.in b/Thunar.spec.in
deleted file mode 100644
index f3b01ab..0000000
--- a/Thunar.spec.in
+++ /dev/null
@@ -1,70 +0,0 @@
-Summary:		Thunar File Manager
-Name:			@PACKAGE_TARNAME@
-Version:		@PACKAGE_VERSION@
-Release:		1
-License:		GPL
-URL:			http://thunar.xfce.org/
-Source0:		%{name}-%{version}.tar.gz
-Group:			Applications/X11
-BuildRoot:		%{_tmppath}/%{name}-root
-Requires:		fam
-Requires:		libexif
-Requires:		shared-mime-info >= 0.15
-Requires:		desktop-file-utils >= 0.7
-Requires:		exo1 >= @EXO_REQUIRED_VERSION@
-Requires:               libxfce4ui >= @LIBXFCE4UI_REQUIRED_VERSION@
-Requires:		startup-notification >= @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
-BuildRequires:		fam-devel
-BuildRequires:		libjpeg-devel
-BuildRequires:		libexif-devel
-BuildRequires:		libpng-devel >= 2:1.2.2-16
-BuildRequires:		desktop-file-utils >= 0.7
-BuildRequires:		exo1-devel >= @EXO_REQUIRED_VERSION@
-BuildRequires:          libxfce4ui-devel >= @LIBXFCE4UI_REQUIRED_VERSION@
-BuildRequires:		startup-notification-devel >= @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
-
-Provides:		@PACKAGE_TARNAME at -devel
-
-%description
-Thunar is a new modern file manager for the Xfce Desktop Environment. It has been designed from
-the ground up to be fast and easy-to-use. Its user interface is clean and intuitive, and does not
-include any confusing or useless options. Thunar is fast and responsive with a good start up time
-and directory load time.
-
-%prep
-%setup -q
-
-%build
-%configure --enable-dbus --enable-final --enable-xsltproc
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-update-desktop-database &> /dev/null ||:
-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
-update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%files
-%defattr(-,root,root)
-%doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS HACKING THANKS
-%{_bindir}/
-%{_datadir}/
-%{_includedir}/
-%{_libdir}/
-%{_mandir}/
-%{_sysconfdir}/
diff --git a/configure.in.in b/configure.in.in
index ceb575d..427d828 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -48,7 +48,7 @@ AC_REVISION([$Id$])
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -77,8 +77,8 @@ AC_CHECK_PROGS([PERL], [perl5 perl])
 dnl **************************
 dnl *** Initialize libtool ***
 dnl **************************
-AC_DISABLE_STATIC()
-AC_PROG_LIBTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl **************************************
 dnl *** Substitute version information ***
@@ -275,7 +275,6 @@ BM_THUNAR_PLUGIN_WALLPAPER()
 
 AC_OUTPUT([
 Makefile
-Thunar.spec
 docs/Makefile
 docs/design/Makefile
 docs/manual/Makefile