diff --git a/distcc-3.2_rc1-freedesktop.patch b/distcc-3.2_rc1-freedesktop.patch index 92ca35f..b4333e0 100644 --- a/distcc-3.2_rc1-freedesktop.patch +++ b/distcc-3.2_rc1-freedesktop.patch @@ -1,6 +1,8 @@ ---- a/Makefile.in 2011-10-26 11:07:15.000000000 +0900 -+++ b/Makefile.in 2011-10-27 16:57:46.815272689 +0900 -@@ -50,13 +50,14 @@ +Index: distcc-3.3.3/Makefile.in +=================================================================== +--- distcc-3.3.3.orig/Makefile.in ++++ distcc-3.3.3/Makefile.in +@@ -52,13 +52,14 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include docdir = @docdir@ @@ -12,12 +14,12 @@ # These must be done from here, not from autoconf, because they can # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" +-DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" ++DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" # arguments to pkgconfig GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1108,10 +1110,10 @@ +@@ -1126,10 +1127,10 @@ install-example: $(example_DOCS) done install-gnome-data: $(gnome_data) @@ -32,8 +34,10 @@ install-conf: $(conf_files) $(default_files) $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" ---- a/gnome/distccmon-gnome.desktop 2011-04-06 03:58:58.000000000 +0900 -+++ b/gnome/distccmon-gnome.desktop 2011-10-27 17:01:50.792242592 +0900 +Index: distcc-3.3.3/gnome/distccmon-gnome.desktop +=================================================================== +--- distcc-3.3.3.orig/gnome/distccmon-gnome.desktop ++++ distcc-3.3.3/gnome/distccmon-gnome.desktop @@ -1,6 +1,4 @@ [Desktop Entry] -Version=0.9.4 @@ -41,7 +45,7 @@ Exec=distccmon-gnome Name=distcc monitor Name[sv]=distcc övervakare -@@ -8,9 +6,9 @@ +@@ -8,9 +6,9 @@ GenericName=Distributed Compile Monitor GenericName[sv]=Distribuerad kompilerings-övervakare Comment=Graphical view of distributed compile tasks Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter @@ -53,9 +57,11 @@ -Categories=GNOME;Application;Development; +Categories=GNOME;Development; StartupNotify=true ---- a/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 -+++ b/src/mon-gnome.c 2011-10-27 16:54:50.220566026 +0900 -@@ -599,7 +599,7 @@ +Index: distcc-3.3.3/src/mon-gnome.c +=================================================================== +--- distcc-3.3.3.orig/src/mon-gnome.c ++++ distcc-3.3.3/src/mon-gnome.c +@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwi #if GTK_CHECK_VERSION(2,2,0) gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), diff --git a/distcc-3.3.3.tar.gz b/distcc-3.3.3.tar.gz new file mode 100644 index 0000000..a9a2734 --- /dev/null +++ b/distcc-3.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7f37d314704fbaf006d747514ff6e4d0d722102ef7d2aea132f97cf170f5169 +size 1000021 diff --git a/distcc-3.3.tar.gz b/distcc-3.3.tar.gz deleted file mode 100644 index 8534444..0000000 --- a/distcc-3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c389146e88e645304cdfd8ce5fb63de5dbdead76d5e3919692b757027f673537 -size 997156 diff --git a/distcc.changes b/distcc.changes index 6362f23..1287e9f 100644 --- a/distcc.changes +++ b/distcc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 23 08:12:50 UTC 2019 - Tomáš Chvátal + +- Update to 3.3.3 bsc#1151594: + * small fixes, such as fixing the build on some non-Linux systems + * Fixes a regression where ssh mode did not work in most circumstances. Bug #291 +- Rebase patch distcc-3.2_rc1-freedesktop.patch + ------------------------------------------------------------------- Tue Jul 23 13:09:00 UTC 2019 - matthias.gerstner@suse.com diff --git a/distcc.spec b/distcc.spec index 999d880..e09bd31 100644 --- a/distcc.spec +++ b/distcc.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,7 +21,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: distcc -Version: 3.3 +Version: 3.3.3 Release: 0 Summary: A distributed C/C++ compiler License: GPL-2.0-or-later @@ -142,12 +142,6 @@ rm -rf %{buildroot}%{_docdir}/%{name}/{INSTALL,COPYING} %postun server %service_del_postun distccd.service -%post gui -%desktop_database_post - -%postun gui -%desktop_database_postun - %files %license COPYING %doc AUTHORS doc/* NEWS README.pump TODO README survey.txt @@ -179,8 +173,8 @@ rm -rf %{buildroot}%{_docdir}/%{name}/{INSTALL,COPYING} %{_bindir}/distccd %{_unitdir}/distccd.service %{_sbindir}/rcdistccd -%{_sysconfdir}/default/distcc -%{_sysconfdir}/distcc/*allow* +%config(noreplace) %{_sysconfdir}/default/distcc +%config(noreplace) %{_sysconfdir}/distcc/*allow* %{_mandir}/man1/distccd* %{_mandir}/man1/include_server* %{_fillupdir}/*