From 7fcc77f52e0bc0797a6c750fe3a8afc1bc5ed1ee Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 30 Jun 2014 01:11:11 +0200 Subject: Provide a spec file to build a Fedora RPM --- packaging/biboumi.spec | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 packaging/biboumi.spec (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec new file mode 100644 index 0000000..5c5491b --- /dev/null +++ b/packaging/biboumi.spec @@ -0,0 +1,77 @@ +Name: biboumi +Version: 1.0 +Release: 1%{?dist} +Summary: Lightweight XMPP to IRC gateway + +License: zlib +URL: http://biboumi.louiz.org +Source0: http://biboumi.louiz.org/biboumi-1.0.tar.xz + +BuildRequires: libidn-devel +BuildRequires: expat-devel +BuildRequires: libuuid-devel +BuildRequires: systemd-devel +BuildRequires: cmake +BuildRequires: systemd +BuildRequires: rubygem-ronn + +%global biboumi_user %{name} +%global biboumi_group %{biboumi_user} +%global biboumi_confdir %{_sysconfdir}/%{name} + + +%description +An XMPP gateway that connects to IRC servers and translates between the two +protocols. It can be used to access IRC channels using any XMPP client as if +these channels were XMPP MUCs. + + +%prep +%setup -q + + +%build +cmake . -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPOLLER=EPOLL +# The documentation is in utf-8, ronn fails to build it if that locale is +# not specified +make %{?_smp_mflags} +LC_ALL=en_GB.utf-8 make doc + + +%install +make install DESTDIR=%{buildroot} + +# Default config file +install -D -p -m 644 conf/biboumi.cfg \ + %{buildroot}%{biboumi_confdir}/biboumi.cfg + +# Systemd unit file +install -D -p -m 644 unit/%{name}.service \ + %{buildroot}%{_unitdir}/%{name}.service + +# Create default log directory +install -p -d %{buildroot}%{biboumi_logdir} + + +%pre +getent group %{biboumi_group} > /dev/null || groupadd -r %{biboumi_group} +getent passwd %{biboumi_user} > /dev/null || \ + useradd -r -g %{biboumi_group} \ + -s /sbin/nologin -c "Biboumi XMPP to IRC gateway" %{biboumi_user} +exit 0 + + +%files +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* +%doc README COPYING doc/biboumi.1.md +%{_unitdir}/%{name}.service +%dir %{biboumi_logdir} +%config(noreplace) %{biboumi_confdir}/biboumi.cfg + + +%changelog +* Wed Jun 25 2014 Le Coz Florent - 1.0-1 +- Spec file written from scratch -- cgit v1.2.3 From eb76171aa00f319d55002a039bd9a042b977dfc0 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 30 Jun 2014 01:40:26 +0200 Subject: Run the test_suite in the spec %check section --- packaging/biboumi.spec | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 5c5491b..e91ce23 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -63,6 +63,12 @@ getent passwd %{biboumi_user} > /dev/null || \ exit 0 +%check +make test_suite/fast VERBOSE=1 + +./test_suite || exit 1 + + %files %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* -- cgit v1.2.3 From d64626648e90d3cd5446184851456308e438eb49 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 30 Jun 2014 01:40:47 +0200 Subject: Remove biboumi_logdir from the spec file --- packaging/biboumi.spec | 1 - 1 file changed, 1 deletion(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index e91ce23..77d275d 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -74,7 +74,6 @@ make test_suite/fast VERBOSE=1 %{_mandir}/man1/%{name}.1* %doc README COPYING doc/biboumi.1.md %{_unitdir}/%{name}.service -%dir %{biboumi_logdir} %config(noreplace) %{biboumi_confdir}/biboumi.cfg -- cgit v1.2.3 From b0ae8c66e34cd253b97da09ef0aaca9261e022a2 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 30 Jun 2014 02:45:15 +0200 Subject: Also remove that from the spec file --- packaging/biboumi.spec | 3 --- 1 file changed, 3 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 77d275d..33464c6 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -51,9 +51,6 @@ install -D -p -m 644 conf/biboumi.cfg \ install -D -p -m 644 unit/%{name}.service \ %{buildroot}%{_unitdir}/%{name}.service -# Create default log directory -install -p -d %{buildroot}%{biboumi_logdir} - %pre getent group %{biboumi_group} > /dev/null || groupadd -r %{biboumi_group} -- cgit v1.2.3 From 8030e5096e1a73e0623bf0d0fd65b25530a318e9 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 31 Jul 2014 15:26:47 +0200 Subject: Do not create a useless biboumi unix user with the RPM package --- packaging/biboumi.spec | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 33464c6..dac4a6d 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -15,8 +15,6 @@ BuildRequires: cmake BuildRequires: systemd BuildRequires: rubygem-ronn -%global biboumi_user %{name} -%global biboumi_group %{biboumi_user} %global biboumi_confdir %{_sysconfdir}/%{name} @@ -52,14 +50,6 @@ install -D -p -m 644 unit/%{name}.service \ %{buildroot}%{_unitdir}/%{name}.service -%pre -getent group %{biboumi_group} > /dev/null || groupadd -r %{biboumi_group} -getent passwd %{biboumi_user} > /dev/null || \ - useradd -r -g %{biboumi_group} \ - -s /sbin/nologin -c "Biboumi XMPP to IRC gateway" %{biboumi_user} -exit 0 - - %check make test_suite/fast VERBOSE=1 -- cgit v1.2.3 From f4c08242fb55809cca3e12d66cbc39e5c9b51fb0 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 18 Aug 2014 02:07:25 +0200 Subject: Update spec file to 1.1 --- packaging/biboumi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 33464c6..b436647 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -1,5 +1,5 @@ Name: biboumi -Version: 1.0 +Version: 1.1 Release: 1%{?dist} Summary: Lightweight XMPP to IRC gateway @@ -75,5 +75,8 @@ make test_suite/fast VERBOSE=1 %changelog +* Wed Aug 18 2014 Le Coz Florent - 1.1-1 +- Update to 1.1 release + * Wed Jun 25 2014 Le Coz Florent - 1.0-1 - Spec file written from scratch -- cgit v1.2.3 From 3d254281afef96ee71ab6fd05c99059a390189c4 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Fri, 29 Aug 2014 03:47:49 +0200 Subject: [spec] Update the URL, and do not hardcode the version in it --- packaging/biboumi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index b436647..83b6eb8 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -5,7 +5,7 @@ Summary: Lightweight XMPP to IRC gateway License: zlib URL: http://biboumi.louiz.org -Source0: http://biboumi.louiz.org/biboumi-1.0.tar.xz +Source0: http://git.louiz.org/biboumi/snapshot/biboumi-%{version}.tar.xz BuildRequires: libidn-devel BuildRequires: expat-devel -- cgit v1.2.3 From 3736cc1f4c23ac4ae29bb505498f174ae6ea73e1 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 13 Nov 2014 06:28:11 +0100 Subject: Use the new flags in the .spec file --- packaging/biboumi.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index cffff09..490aa42 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -1,6 +1,6 @@ Name: biboumi Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight XMPP to IRC gateway License: zlib @@ -31,10 +31,15 @@ these channels were XMPP MUCs. %build cmake . -DCMAKE_BUILD_TYPE=release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPOLLER=EPOLL + -DPOLLER=EPOLL \ + -DWITHOUT_BOTAN=1 \ + -DWITH_SYSTEMD=1 \ + -DWITH_LIBIDN=1 + +make %{?_smp_mflags} + # The documentation is in utf-8, ronn fails to build it if that locale is # not specified -make %{?_smp_mflags} LC_ALL=en_GB.utf-8 make doc @@ -65,6 +70,9 @@ make test_suite/fast VERBOSE=1 %changelog +* Wed Nov 13 2014 Le Coz Florent - 1.1-2 +- Use the -DWITH(OUT) cmake flags for all optional dependencies + * Wed Aug 18 2014 Le Coz Florent - 1.1-1 - Update to 1.1 release -- cgit v1.2.3 From 0de421fad825494a977eb50d561eac92244cd42b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 13 Nov 2014 06:43:39 +0100 Subject: Build with the fedora CFLAGS in the .spec --- packaging/biboumi.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 490aa42..0cd1435 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -29,12 +29,13 @@ these channels were XMPP MUCs. %build -cmake . -DCMAKE_BUILD_TYPE=release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPOLLER=EPOLL \ - -DWITHOUT_BOTAN=1 \ - -DWITH_SYSTEMD=1 \ - -DWITH_LIBIDN=1 +cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPOLLER=EPOLL \ + -DWITHOUT_BOTAN=1 \ + -DWITH_SYSTEMD=1 \ + -DWITH_LIBIDN=1 make %{?_smp_mflags} @@ -72,6 +73,7 @@ make test_suite/fast VERBOSE=1 %changelog * Wed Nov 13 2014 Le Coz Florent - 1.1-2 - Use the -DWITH(OUT) cmake flags for all optional dependencies +- Build with the correct optflags * Wed Aug 18 2014 Le Coz Florent - 1.1-1 - Update to 1.1 release -- cgit v1.2.3 From 7bfe695c2f8ff4b365ab5c2d74b4a317518576e7 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 13 Nov 2014 06:52:00 +0100 Subject: Use hardened_build 1 in the spec file See http://fedoraproject.org/wiki/Packaging:Guidelines#PIE --- packaging/biboumi.spec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 0cd1435..aba47c1 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -15,6 +15,8 @@ BuildRequires: cmake BuildRequires: systemd BuildRequires: rubygem-ronn +%global _hardened_build 1 + %global biboumi_confdir %{_sysconfdir}/%{name} @@ -74,6 +76,7 @@ make test_suite/fast VERBOSE=1 * Wed Nov 13 2014 Le Coz Florent - 1.1-2 - Use the -DWITH(OUT) cmake flags for all optional dependencies - Build with the correct optflags +- Use hardened_build * Wed Aug 18 2014 Le Coz Florent - 1.1-1 - Update to 1.1 release -- cgit v1.2.3 From c649e56deb0d107931980b622de4d1cb832a2c33 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Fri, 29 May 2015 00:00:00 +0200 Subject: Release version 2.0 --- packaging/biboumi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index aba47c1..fb9a30f 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -1,6 +1,6 @@ Name: biboumi -Version: 1.1 -Release: 2%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Lightweight XMPP to IRC gateway License: zlib @@ -73,6 +73,9 @@ make test_suite/fast VERBOSE=1 %changelog +* Fri May 29 2015 Le Coz Florent - 2.0-1 +- Update to 2.0 sources + * Wed Nov 13 2014 Le Coz Florent - 1.1-2 - Use the -DWITH(OUT) cmake flags for all optional dependencies - Build with the correct optflags -- cgit v1.2.3 From 25475b60ab363299ddbe5e81ded8968b76838b44 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 13 Jan 2016 19:44:58 +0100 Subject: Generate systemd file from template and make installs it and the conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The unit file Type=, as well as the executable path should now be correct with a simple “make install”, whatever the install prefix and the DESTDIR values are. ref #3152 --- packaging/biboumi.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index fb9a30f..e375504 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -49,14 +49,6 @@ LC_ALL=en_GB.utf-8 make doc %install make install DESTDIR=%{buildroot} -# Default config file -install -D -p -m 644 conf/biboumi.cfg \ - %{buildroot}%{biboumi_confdir}/biboumi.cfg - -# Systemd unit file -install -D -p -m 644 unit/%{name}.service \ - %{buildroot}%{_unitdir}/%{name}.service - %check make test_suite/fast VERBOSE=1 @@ -73,6 +65,10 @@ make test_suite/fast VERBOSE=1 %changelog +* Wed Jan 13 2016 Le Coz Florent - 2.0-2 +- Do not install the systemd unit and configuration files, because + “make install” does it itself now + * Fri May 29 2015 Le Coz Florent - 2.0-1 - Update to 2.0 sources -- cgit v1.2.3 From 1e79705628af79b2cf6f87a67268f8202774bb9b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 13 Jan 2016 13:50:34 +0100 Subject: Build the doc with the default make target --- packaging/biboumi.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index e375504..ce57800 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -39,11 +39,10 @@ cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \ -DWITH_SYSTEMD=1 \ -DWITH_LIBIDN=1 -make %{?_smp_mflags} - # The documentation is in utf-8, ronn fails to build it if that locale is # not specified -LC_ALL=en_GB.utf-8 make doc +export LC_ALL=en_GB.utf-8 +make %{?_smp_mflags} %install -- cgit v1.2.3 From 5da0158fdb4a77512555a82ead49b7e794824e3b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 13 Jan 2016 21:52:57 +0100 Subject: Use make check in the spec file --- packaging/biboumi.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index ce57800..6961874 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -50,9 +50,7 @@ make install DESTDIR=%{buildroot} %check -make test_suite/fast VERBOSE=1 - -./test_suite || exit 1 +make check %files -- cgit v1.2.3 From ed49e067a0d2fe25f4e3cd653258ad24a2772893 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 14 Jan 2016 00:32:04 +0100 Subject: Compile with smp_mflags for tests as well --- packaging/biboumi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index 6961874..5c3afb4 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -50,7 +50,7 @@ make install DESTDIR=%{buildroot} %check -make check +make check %{?_smp_mflags} %files -- cgit v1.2.3 From ae7c54f3737b3646edfa5c4d4d7fd553aa296da6 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Fri, 22 Jan 2016 00:47:24 +0100 Subject: Spec file becomes a template, auto filled with the date and version --- packaging/biboumi.spec | 81 ------------------------------------------ packaging/biboumi.spec.cmake | 84 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 81 deletions(-) delete mode 100644 packaging/biboumi.spec create mode 100644 packaging/biboumi.spec.cmake (limited to 'packaging') diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec deleted file mode 100644 index 5c3afb4..0000000 --- a/packaging/biboumi.spec +++ /dev/null @@ -1,81 +0,0 @@ -Name: biboumi -Version: 2.0 -Release: 1%{?dist} -Summary: Lightweight XMPP to IRC gateway - -License: zlib -URL: http://biboumi.louiz.org -Source0: http://git.louiz.org/biboumi/snapshot/biboumi-%{version}.tar.xz - -BuildRequires: libidn-devel -BuildRequires: expat-devel -BuildRequires: libuuid-devel -BuildRequires: systemd-devel -BuildRequires: cmake -BuildRequires: systemd -BuildRequires: rubygem-ronn - -%global _hardened_build 1 - -%global biboumi_confdir %{_sysconfdir}/%{name} - - -%description -An XMPP gateway that connects to IRC servers and translates between the two -protocols. It can be used to access IRC channels using any XMPP client as if -these channels were XMPP MUCs. - - -%prep -%setup -q - - -%build -cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \ - -DCMAKE_BUILD_TYPE=release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPOLLER=EPOLL \ - -DWITHOUT_BOTAN=1 \ - -DWITH_SYSTEMD=1 \ - -DWITH_LIBIDN=1 - -# The documentation is in utf-8, ronn fails to build it if that locale is -# not specified -export LC_ALL=en_GB.utf-8 -make %{?_smp_mflags} - - -%install -make install DESTDIR=%{buildroot} - - -%check -make check %{?_smp_mflags} - - -%files -%{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* -%doc README COPYING doc/biboumi.1.md -%{_unitdir}/%{name}.service -%config(noreplace) %{biboumi_confdir}/biboumi.cfg - - -%changelog -* Wed Jan 13 2016 Le Coz Florent - 2.0-2 -- Do not install the systemd unit and configuration files, because - “make install” does it itself now - -* Fri May 29 2015 Le Coz Florent - 2.0-1 -- Update to 2.0 sources - -* Wed Nov 13 2014 Le Coz Florent - 1.1-2 -- Use the -DWITH(OUT) cmake flags for all optional dependencies -- Build with the correct optflags -- Use hardened_build - -* Wed Aug 18 2014 Le Coz Florent - 1.1-1 -- Update to 1.1 release - -* Wed Jun 25 2014 Le Coz Florent - 1.0-1 -- Spec file written from scratch diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake new file mode 100644 index 0000000..633a168 --- /dev/null +++ b/packaging/biboumi.spec.cmake @@ -0,0 +1,84 @@ +Name: biboumi +Version: ${RPM_VERSION} +Release: 1%{?dist} +Summary: Lightweight XMPP to IRC gateway + +License: zlib +URL: http://biboumi.louiz.org +Source0: http://git.louiz.org/biboumi/snapshot/biboumi-%{version}.tar.xz + +BuildRequires: libidn-devel +BuildRequires: expat-devel +BuildRequires: libuuid-devel +BuildRequires: systemd-devel +BuildRequires: cmake +BuildRequires: systemd +BuildRequires: rubygem-ronn + +%global _hardened_build 1 + +%global biboumi_confdir %{_sysconfdir}/%{name} + + +%description +An XMPP gateway that connects to IRC servers and translates between the two +protocols. It can be used to access IRC channels using any XMPP client as if +these channels were XMPP MUCs. + + +%prep +%setup -q + + +%build +cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPOLLER=EPOLL \ + -DWITHOUT_BOTAN=1 \ + -DWITH_SYSTEMD=1 \ + -DWITH_LIBIDN=1 + +# The documentation is in utf-8, ronn fails to build it if that locale is +# not specified +export LC_ALL=en_GB.utf-8 +make %{?_smp_mflags} + + +%install +make install DESTDIR=%{buildroot} + + +%check +make check %{?_smp_mflags} + + +%files +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* +%doc README COPYING doc/biboumi.1.md +%{_unitdir}/%{name}.service +%config(noreplace) %{biboumi_confdir}/biboumi.cfg + + +%changelog +* ${RPM_DATE} Le Coz Florent - ${RPM_VERSION}-1 +- Build latest git revision + +* Wed Jan 13 2016 Le Coz Florent - 2.0-2 +- Do not install the systemd unit and configuration files, because + “make install” does it itself now + +* Fri May 29 2015 Le Coz Florent - 2.0-1 +- Update to 2.0 sources + +* Thu Nov 13 2014 Le Coz Florent - 1.1-2 +- Use the -DWITH(OUT) cmake flags for all optional dependencies +- Build with the correct optflags +- Use hardened_build + +* Mon Aug 18 2014 Le Coz Florent - 1.1-1 +- Update to 1.1 release + +* Wed Jun 25 2014 Le Coz Florent - 1.0-1 +- Spec file written from scratch -- cgit v1.2.3 From b32729fb8a5ff5cdbd6c94ad327a09aa19396389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 8 Mar 2016 20:29:31 +0100 Subject: Convert README, INSTALL etc to markdown --- packaging/biboumi.spec.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index 633a168..08b5c6d 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -56,7 +56,7 @@ make check %{?_smp_mflags} %files %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* -%doc README COPYING doc/biboumi.1.md +%doc README.md COPYING doc/biboumi.1.md %{_unitdir}/%{name}.service %config(noreplace) %{biboumi_confdir}/biboumi.cfg -- cgit v1.2.3 From 38202e5f6e16d8fc1e07811049851bfa417fb9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Mon, 23 May 2016 11:51:03 +0200 Subject: Update the build process to take into account the rst files --- packaging/biboumi.spec.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index 08b5c6d..f38f4c4 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -13,7 +13,7 @@ BuildRequires: libuuid-devel BuildRequires: systemd-devel BuildRequires: cmake BuildRequires: systemd -BuildRequires: rubygem-ronn +BuildRequires: pandoc %global _hardened_build 1 @@ -39,9 +39,6 @@ cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \ -DWITH_SYSTEMD=1 \ -DWITH_LIBIDN=1 -# The documentation is in utf-8, ronn fails to build it if that locale is -# not specified -export LC_ALL=en_GB.utf-8 make %{?_smp_mflags} @@ -56,7 +53,7 @@ make check %{?_smp_mflags} %files %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* -%doc README.md COPYING doc/biboumi.1.md +%doc README.rst COPYING doc/biboumi.1.rst %{_unitdir}/%{name}.service %config(noreplace) %{biboumi_confdir}/biboumi.cfg -- cgit v1.2.3 From 0f14fe83ef53b08bd8fa09670c82f4996c329bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Thu, 4 Aug 2016 11:32:45 +0200 Subject: Release 3.0 --- packaging/biboumi.spec.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index f38f4c4..c94da8b 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -59,8 +59,8 @@ make check %{?_smp_mflags} %changelog -* ${RPM_DATE} Le Coz Florent - ${RPM_VERSION}-1 -- Build latest git revision +* Thu Aug 4 2016 Le Coz Florent - 3.0-1 +- Update to 3.0 sources * Wed Jan 13 2016 Le Coz Florent - 2.0-2 - Do not install the systemd unit and configuration files, because -- cgit v1.2.3