Updating branch refs/heads/master
to 4bc62428359f9e29ac675acd5f35b2833c0d2785 (commit)
from 34291902cdf4432dd68ad6fed3b41757bb046a01 (commit)
commit 4bc62428359f9e29ac675acd5f35b2833c0d2785
Author: Nick Schermer <[email protected]>
Date: Sat Apr 14 10:06:33 2012 +0200
Updates for release.
Makefile.am | 8 --------
NEWS | 5 +++++
configure.in.in | 5 ++---
gtk-xfce-engine-2.spec.in | 36 ------------------------------------
4 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ad88561..234d570 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,3 @@ ChangeLog: Makefile
|| (touch ChangeLog; echo 'Git directory not found: installing possibly
empty changelog.' >&2)
dist-hook: ChangeLog
-
-rpm : dist
- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
- @rm -f $(PACKAGE)-$(VERSION).tar.gz
-
-EXTRA_DIST = \
- gtk-xfce-engine-2.spec \
- gtk-xfce-engine-2.spec.in
diff --git a/NEWS b/NEWS
index 6a2559d..c503131 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2.99.3
+======
+- Link against libm for floor() and ceil().
+- Reduce GtkComboBox padding (bug #8455).
+
2.99.2
======
- Improved menu theming
diff --git a/configure.in.in b/configure.in.in
index 72934fb..d324f49 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -7,10 +7,10 @@ dnl *** Version information ***
dnl ***************************
m4_define([gtk_xfce_engine_version_major], [2])
m4_define([gtk_xfce_engine_version_minor], [99])
-m4_define([gtk_xfce_engine_version_micro], [2])
+m4_define([gtk_xfce_engine_version_micro], [3])
m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no
nano version
m4_define([gtk_xfce_engine_version_build], [@REVISION@])
-m4_define([gtk_xfce_engine_version_tag], [git])
+m4_define([gtk_xfce_engine_version_tag], [])
m4_define([gtk_xfce_engine_version],
[gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(),
[], [],
[.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git],
[gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()],
[gtk_xfce_engine_version_tag()])])
dnl *******************************************
@@ -100,7 +100,6 @@ AC_MSG_RESULT([$PLATFORM_LDFLAGS])
AC_SUBST([PLATFORM_LDFLAGS])
AC_OUTPUT([
-gtk-xfce-engine-2.spec
Makefile
gtk-2.0/Makefile
gtk-3.0/Makefile
diff --git a/gtk-xfce-engine-2.spec.in b/gtk-xfce-engine-2.spec.in
deleted file mode 100644
index da03ce4..0000000
--- a/gtk-xfce-engine-2.spec.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Summary: Port of xfce engine to GTK+-2.0
-Name: gtk-xfce-engine
-Version: @VERSION@
-Release: 1
-License: GPL
-URL: http://www.xfce.org/
-Source0: %{name}-%{version}.tar.bz2
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: gtk2 >= @GTK_REQUIRED_VERSION@
-Requires: glib2 >= @GLIB_REQUIRED_VERSION@
-BuildRequires: gtk2-devel >= @GTK_REQUIRED_VERSION@
-BuildRequires: glib2-devel >= @GLIB_REQUIRED_VERSION@
-
-%description
-A port of Xfce engine to GTK+-2.0.
-
-%prep
-%setup -q
-
-%build
-%configure
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{_libdir}/*
-%{_datadir}/*
-
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
