Update the build and packaging script for Fedora 37.

ChangeLog

@@ -2,8 +2,8 @@
 All notable changes to this project will be documented in this file.
 Date based versioning is now used in this project.  This is so that it doesn't get confused with the Dropbox desktop client.
 
-Unreleased
-----------
+Version 2022.12.05
+------------------
 	* Update to use libnautilus-extension-4 and gtk4, supporting Nautilus 43+.
 	* Fix various uses of deprecated APIs, such as the "DeprecationWarning: isSet() is deprecated" warning.
 	* Fix colors of ignored files in `dropbox filestatus`.

HOWTO_PACKAGE.md

@@ -2,46 +2,60 @@
 
 This is a work-in-progress guide on how to build Ubuntu, Debian, and
 Fedora packages for nautilus-dropbox. It assumes you're building from
-a 16.04 Ubuntu machine.
+an Ubuntu 22.10 machine for the `.deb` build and a Fedora 37 machine for the `.rpm` build.
 
-1. Obtain the signing key. Add it to your keyring using `gpg --import /path/to/key`.
+1. Obtain the signing tarball and extract all of the files into your `~/.gnupg`
+   directory. If producing an RPM build, also import it into RPM with
+   `sudo rpm --import /path/to/key`.
 
-2. Install the build dependencies.
+2. On a Debian/Ubuntu machine:
+   1. Install dependencies:
 
-This is a non-exhaustive list of what you'll need:
+      ```
+      sudo apt-get install pbuilder debootstrap devscripts libnautilus-extension-dev cdbs gnome-common debian-archive-keyring python3-docutils
+      ```
 
-```
-sudo apt-get install pbuilder debootstrap devscripts libnautilus-extension-dev mock rpm expect createrepo cdbs gnome-common debian-archive-keyring python3-docutils
-```
+   2. Copy `.pbuilderrc` to `~/.pbuilderrc`
 
-3. Copy .pbuilderrc to ~/.pbuilderrc
+   3. Create chroots for each of the Debian or Ubuntu builds you'll be doing.
 
-4. Create chroots for each of the Debian or Ubuntu builds you'll be doing.
+   ```
+   sudo DIST=trusty ARCH=i386 pbuilder create --debootstrapopts --variant=buildd
+   sudo DIST=trusty ARCH=amd64 pbuilder create --debootstrapopts --variant=buildd
+   sudo DIST=jessie ARCH=i386 pbuilder create --debootstrapopts --variant=buildd
+   sudo DIST=jessie ARCH=amd64 pbuilder create --debootstrapopts --variant=buildd
+   ```
 
-```
-sudo DIST=trusty ARCH=i386 pbuilder create --debootstrapopts --variant=buildd
-sudo DIST=trusty ARCH=amd64 pbuilder create --debootstrapopts --variant=buildd
-sudo DIST=jessie ARCH=i386 pbuilder create --debootstrapopts --variant=buildd
-sudo DIST=jessie ARCH=amd64 pbuilder create --debootstrapopts --variant=buildd
-```
+   4. Build all the packages with: `python3 build_packages.py deb`
 
-5. Add yourself to the mock group (create it if it doesn't exist), and
-   then logout and login for the group to take affect.
-   Probably you have to run `build_packages.py` command with `sudo` permission which 
-   means you should add your root account to the mock group. Otherwise, you will see
-   `The password you typed is invalid.` error.
+4. On a Fedora machine:
+   1. Install dependencies:
 
-6. Copy rpm_resources/fedora-*.cfg to /etc/mock.
+      ```
+      sudo dnf install devscripts libnautilus-extension-dev mock rpm rpm-sign rpmdevtools rpmlint expect createrepo cdbs gnome-common python3-docutils rpm-build gawk nautilus-devel
+      ```
 
-   If you need to add new configs when we start targetting a new Fedora version,
-   you can find all the configs here:  https://github.com/rpm-software-management/mock
+   2. Add yourself to the mock group (create it if it doesn't exist), and
+      then logout and login for the group to take affect.
+      `build_packages.py` will use `sudo` for a few of the commands, so add both
+      your user account and root to the group.
 
-7. Copy rpm_resources/.rpmmacros to ~/.rpmmacros
+   3. Copy `rpm_resources/fedora-*.cfg` to `/etc/mock`.
 
-8. Build all the packages with: `python3 build_packages.py`
+      If you need to add new configs when we start targetting a new Fedora
+      version, you can find all the configs here:
+      https://github.com/rpm-software-management/mock.
 
-If the build is successful, a tar of the output will be in: /tmp/nautilus-dropbox-release.tar.gz
+      The configs in that repo are templatized, so you'll also have to manually
+      copy the template contents into your copy.
 
-8. Update the ChangeLog with all the changes in the release.
+   4. Copy `rpm_resources/.rpmmacros` to `~/.rpmmacros`
 
-9. Tag the release and push the tag to GitHub.
+   5. Build all the packages with: `python3 build_packages.py rpm`
+
+5. Gather the built outputs from both machines, and put them in the repo root
+   (this step can be done on either machine). Run `python3 build_packages.py package`.
+
+6. Update the ChangeLog with all the changes in the release.
+
+7. Tag the release and push the tag to GitHub.

build_packages.py

@@ -29,17 +29,17 @@ def generate_packages(self):
             assert self.system('rm -f /tmp/nautilus-dropbox-release.tar.gz') == 0
 
         # Source
-        assert self.system('cp nautilus-dropbox-*.tar.bz2 /home/releng/result/packages') == 0
+        assert self.system('cp nautilus-dropbox-*.tar.bz2 /tmp/dbx_build/result/packages') == 0
 
         # Get dropbox.py
         assert self.system('make dropbox') == 0
         assert self.system(
-            'cp {REPO_DIR}/dropbox /home/releng/result/packages/dropbox.py'.format(
+            'cp {REPO_DIR}/dropbox /tmp/dbx_build/result/packages/dropbox.py'.format(
                 REPO_DIR=REPO_DIR,
             )) == 0
 
         # Tar it up
-        assert self.system('cd /home/releng/result/; tar czvf /tmp/nautilus-dropbox-release.tar.gz *') == 0
+        assert self.system('cd /tmp/dbx_build/result/; tar czvf /tmp/nautilus-dropbox-release.tar.gz *') == 0
 
     def build_deb(self, dist, arch):
         assert self.system('sh generate-deb.sh') == 0
@@ -58,7 +58,7 @@ def build_deb(self, dist, arch):
 
     def generate_deb_repo(self, distro_upper, codenames, dist, archs):
         distro = distro_upper.lower()
-        result = '/home/releng/result/%s' % distro
+        result = '/tmp/dbx_build/result/%s' % distro
         assert self.system('rm -rf %s' % result) == 0
         assert self.system('mkdir -p %s/pool/main' % result) == 0
         for arch in archs:
@@ -74,43 +74,43 @@ def generate_deb_repo(self, distro_upper, codenames, dist, archs):
 
         # Add pacakge symlinks
         files = os.listdir(os.path.join(result, 'pool', 'main'))
-        assert self.system('mkdir -p /home/releng/result/packages/%s' % distro) == 0
+        assert self.system('mkdir -p /tmp/dbx_build/result/packages/%s' % distro) == 0
         for f in files:
             if f.endswith('.deb'):
-                assert self.system('ln -s ../../%s/pool/main/%s /home/releng/result/packages/%s' %
+                assert self.system('ln -s ../../%s/pool/main/%s /tmp/dbx_build/result/packages/%s' %
                                    (distro, f, distro)) == 0
 
     def generate_yum_repo(self, distro_upper, codenames, dist, archs, dist_name):
         distro = distro_upper.lower()
-        assert self.system('rm -rf /home/releng/result/fedora') == 0
-        assert self.system('mkdir -p /home/releng/result/fedora/pool/') == 0
+        assert self.system('rm -rf /tmp/dbx_build/result/fedora') == 0
+        assert self.system('mkdir -p /tmp/dbx_build/result/fedora/pool/') == 0
 
         for arch in archs:
-            assert self.system('cp %s/%s-%s/result/*.rpm /home/releng/result/fedora/pool' % (MOCK_OUT, dist, arch)) == 0
+            assert self.system('cp %s/%s-%s/result/*.rpm /tmp/dbx_build/result/fedora/pool' % (MOCK_OUT, dist, arch)) == 0
 
-        files = os.listdir('/home/releng/result/fedora/pool')
+        files = os.listdir('/tmp/dbx_build/result/fedora/pool')
         for f in files:
-            f = '/home/releng/result/fedora/pool/' + f
+            f = '/tmp/dbx_build/result/fedora/pool/' + f
             newname = f.replace(dist_name, 'fedora')
             os.rename(f, newname)
 
         old = os.getcwd()
-        os.chdir('/home/releng/result/fedora')
+        os.chdir('/tmp/dbx_build/result/fedora')
         try:
             assert self.system('DISTS="%s" sh %s/create-yum-repo.sh' % (codenames, old)) == 0
         finally:
             os.chdir(old)
 
         # Add pacakge symlinks
-        assert self.system('mkdir -p /home/releng/result/packages/%s' % distro) == 0
-        files = os.listdir('/home/releng/result/fedora/pool')
+        assert self.system('mkdir -p /tmp/dbx_build/result/packages/%s' % distro) == 0
+        files = os.listdir('/tmp/dbx_build/result/fedora/pool')
         for f in files:
             if re.match(r'nautilus-dropbox-[0-9.-]*\.fedora\.(i386|x86_64)\.rpm', f):
-                assert self.system('ln -s ../../%s/pool/%s /home/releng/result/packages/%s' %
+                assert self.system('ln -s ../../%s/pool/%s /tmp/dbx_build/result/packages/%s' %
                                    (distro, f, distro)) == 0
 
     def build_rpm(self, config):
-        # config='fedora-21-i386,fedora-21-x86_64'
+        # config='fedora-37-i386,fedora-37-x86_64'
         assert self.system('sh generate-rpm.sh') == 0
 
         path = None
@@ -132,7 +132,7 @@ def build_rpm(self, config):
 
         try:
             assert self.system(
-                '/usr/bin/mock -r {config} --resultdir={mock_config_out} rebuild {path}'.format(
+                'sudo /usr/bin/mock -r {config} --resultdir={mock_config_out} rebuild {path}'.format(
                     config=config,
                     mock_config_out=mock_config_out,
                     path=path)) == 0
@@ -141,7 +141,9 @@ def build_rpm(self, config):
             self.system('cat %s/*.log >&2' % (mock_config_out,))
             raise
         else:
-            assert self.system('find %s/ -name *.rpm | xargs /usr/bin/expect sign-rpm.exp' % (
+            username = cmd('whoami').decode('utf-8')
+            assert self.system('sudo chown -R %s:%s %s' % (username, username, mock_config_out)) == 0
+            assert self.system('find %s/ -name *.rpm -exec /usr/bin/expect sign-rpm.exp {} \\;' % (
                 mock_config_out,)) == 0
 
     def build_all(self):
@@ -153,25 +155,28 @@ def build_all(self):
         with open("distro-info.sh") as f:
             exec(f.read(), {}, info)
 
-        assert self.system('rm -rf /home/releng/result') == 0
-        assert self.system('mkdir -p /home/releng/result/packages') == 0
+        assert self.system('rm -rf /tmp/dbx_build/result') == 0
+        assert self.system('mkdir -p /tmp/dbx_build/result/packages') == 0
 
-        # Ubuntu
-        self.build_deb('trusty', 'i386')
-        self.build_deb('trusty', 'amd64')
-        self.generate_deb_repo('Ubuntu', info['UBUNTU_CODENAMES'], 'trusty', ['amd64', 'i386'])
+        if len(sys.argv) == 1 or 'deb' in sys.argv:
+            # Ubuntu
+            self.build_deb('trusty', 'i386')
+            self.build_deb('trusty', 'amd64')
+            self.generate_deb_repo('Ubuntu', info['UBUNTU_CODENAMES'], 'trusty', ['amd64', 'i386'])
 
-        # Debian
-        self.build_deb('jessie', 'i386')
-        self.build_deb('jessie', 'amd64')
-        self.generate_deb_repo('Debian', info['DEBIAN_CODENAMES'], 'jessie', ['amd64', 'i386'])
+            # Debian
+            self.build_deb('jessie', 'i386')
+            self.build_deb('jessie', 'amd64')
+            self.generate_deb_repo('Debian', info['DEBIAN_CODENAMES'], 'jessie', ['amd64', 'i386'])
 
         # Fedora
-        self.build_rpm('fedora-21-i386')
-        self.build_rpm('fedora-21-x86_64')
-        self.generate_yum_repo('Fedora', info['FEDORA_CODENAMES'], 'fedora-21', ['i386', 'x86_64'], 'fc21')
+        if len(sys.argv) == 1 or 'rpm' in sys.argv:
+            # Fedora dropped 32-bit support several versions ago.
+            self.build_rpm('fedora-37-x86_64')
+            self.generate_yum_repo('Fedora', info['FEDORA_CODENAMES'], 'fedora-37', ['x86_64'], 'fc37')
 
-        self.generate_packages()
+        if len(sys.argv) == 1 or 'package' in sys.argv:
+            self.generate_packages()
 
 
 if __name__ == "__main__":

configure.ac

@@ -1,6 +1,6 @@
 # Initialization
 
-AC_INIT([nautilus-dropbox], 2020.03.04)
+AC_INIT([nautilus-dropbox], 2022.12.05)
 
 AM_INIT_AUTOMAKE([foreign])
 

create-yum-repo.sh

@@ -3,7 +3,7 @@
 set -e
 
 # DISTS must be defined.
-ARCHS="i386 x86_64"
+ARCHS="x86_64"
 
 for DIST in $DISTS; do
 

distro-info.sh

@@ -2,4 +2,4 @@
 # This file also gets execfile'd by python so don't do anything here besides set variables.
 UBUNTU_CODENAMES="trusty utopic vivid wily xenial yakkety zesty artful bionic cosmic disco eoan"
 DEBIAN_CODENAMES="jessie stretch buster sid"
-FEDORA_CODENAMES="21 22 23 24 25 26 27 28 29 30 31"
+FEDORA_CODENAMES="21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37"

generate-rpm.sh

@@ -29,7 +29,7 @@ cat <<EOF > $HOME/.rpmmacros
 %_tmppath              $(pwd)/rpmbuild
 %_smp_mflags  -j3
 %_signature gpg
-%_gpg_name 3565780E
+%_gpg_name 5044912e
 %_gpgbin /usr/bin/gpg
 EOF
 
@@ -58,7 +58,7 @@ cp nautilus-dropbox-$CURVER.tar.bz2 rpmbuild/SOURCES/
 
 cat <<EOF > rpmbuild/SPECS/nautilus-dropbox.spec
 %define glib_version 2.42.1
-%define nautilus_version 3.14.2
+%define nautilus_version 43.0
 %define libgnome_version 2.32.1
 %define pygobject3_version 3.14.0
 %define pygpgme_version 0.3
@@ -75,7 +75,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 
 Requires:	nautilus-extensions >= %{nautilus_version}
 Requires:	glib2 >= %{glib_version}
-Requires:	libgnome >= %{gnome_version}
+Requires:	libgnome >= %{libgnome_version}
 Requires:	python3
 Requires:	python3-gobject >= %{pygobject3_version}
 
@@ -84,12 +84,13 @@ Requires:	python3-gobject >= %{pygobject3_version}
 BuildRequires:	nautilus-devel >= %{nautilus_version}
 BuildRequires:	glib2-devel >= %{glib_version}
 BuildRequires:	python3-docutils
-BuildRequires:  cairo-devel
-BuildRequires:  gtk3-devel
-BuildRequires:  atk-devel
-BuildRequires:  pango-devel
-BuildRequires:  python3
-BuildRequires:  python3-gobject >= %{pygobject3_version}
+BuildRequires:	cairo-devel
+BuildRequires:	gcc
+BuildRequires:	gtk4-devel
+BuildRequires:	atk-devel
+BuildRequires:	pango-devel
+BuildRequires:	python3
+BuildRequires:	python3-gobject >= %{pygobject3_version}
 %description
 Nautilus Dropbox is an extension that integrates
 the Dropbox web service with your GNOME Desktop.
@@ -109,17 +110,8 @@ make %{?_smp_mflags}
 rm -rf \$RPM_BUILD_ROOT
 make install DESTDIR=\$RPM_BUILD_ROOT
 
-if [ -d \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0 ]; then
-    rm \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la
-    rm \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.a
-    mkdir -p \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0
-    ln -s ../extensions-2.0/libnautilus-dropbox.so \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/
-elif [ -d \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0 ]; then
-    rm \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
-    rm \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.a
-    mkdir -p \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0
-    ln -s ../extensions-3.0/libnautilus-dropbox.so \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/
-fi
+rm \$RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-4/libnautilus-dropbox.{,l}a
+
 
 %post
 /sbin/ldconfig
@@ -128,8 +120,7 @@ fi
 
 if [ \$1 -gt 1 ] ; then
   # Old versions of the rpm delete the files in postun.  So just in case let's make a backup copy.  The backup copy will be restored in posttrans.
-  ln -f %{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so{,.bak}
-  ln -f %{_libdir}/nautilus/extensions-2.0/libnautilus-dropbox.so{,.bak}
+  ln -f %{_libdir}/nautilus/extensions-4/libnautilus-dropbox.so{,.bak}
 fi
 
 EOF
@@ -194,9 +185,9 @@ fi
 PROCS=`pgrep -x nautilus`
 
 for PROC in $PROCS; do
-  # Extract the display variable so that we can show a box.  
-  # Hope they have xauth to localhost. 
-  export `cat /proc/$PROC/environ | tr "\0" "\n" | grep DISPLAY` 
+  # Extract the display variable so that we can show a box.
+  # Hope they have xauth to localhost.
+  export `cat /proc/$PROC/environ | tr "\0" "\n" | grep DISPLAY`
 
   zenity --question --timeout=30 --title=Dropbox --text='The Nautilus File Browser has to be restarted. Any open file browser windows will be closed in the process. Do this now?' > /dev/null 2>&1
   if [ $? -eq 0 ] ; then
@@ -227,29 +218,22 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-# Old versions of the rpm delete these files in postun.  Fortunately we have saved a backup.  
-if [ ! -e %{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so ]; then
-  if [ -e %{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so.bak ]; then
-    mv -f %{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so{.bak,}
-  fi
-fi
-if [ ! -e %{_libdir}/nautilus/extensions-2.0/libnautilus-dropbox.so ]; then
-  if [ -e %{_libdir}/nautilus/extensions-2.0/libnautilus-dropbox.so.bak ]; then
-    mv -f %{_libdir}/nautilus/extensions-2.0/libnautilus-dropbox.so{.bak,}
+# Old versions of the rpm delete these files in postun.  Fortunately we have saved a backup.
+if [ ! -e %{_libdir}/nautilus/extensions-4/libnautilus-dropbox.so ]; then
+  if [ -e %{_libdir}/nautilus/extensions-4/libnautilus-dropbox.so.bak ]; then
+    mv -f %{_libdir}/nautilus/extensions-4/libnautilus-dropbox.so{.bak,}
   fi
 fi
 
-rm -f %{_libdir}/nautilus/extensions-3.0/libnautilus-dropbox.so.bak
-rm -f %{_libdir}/nautilus/extensions-2.0/libnautilus-dropbox.so.bak
+rm -f %{_libdir}/nautilus/extensions-4/libnautilus-dropbox.so.bak
 
 %clean
 rm -rf \$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc
-%{_libdir}/nautilus/extensions-2.0/*.so*
-%{_libdir}/nautilus/extensions-3.0/*.so*
+%{_libdir}/nautilus/extensions-4/*.so*
 %{_datadir}/icons/hicolor/*
 %{_datadir}/nautilus-dropbox/emblems/*
 %{_bindir}/dropbox