rpms/proas/F-17 proas.spec,1.3,1.4
by Sergio Pascual
Author: sergiopr
Update of /cvs/nonfree/rpms/proas/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5543
Modified Files:
proas.spec
Log Message:
* Wed Oct 10 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-2
- Enable -fbackslash (fixes bz #2517)
Index: proas.spec
===================================================================
RCS file: /cvs/nonfree/rpms/proas/F-17/proas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proas.spec 23 Mar 2012 16:14:02 -0000 1.3
+++ proas.spec 10 Oct 2012 14:04:17 -0000 1.4
@@ -1,12 +1,11 @@
Summary: Planning of astronomical observations
Name: proas
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Applications/Engineering
URL: https://guaix.fis.ucm.es/projects/proas/wiki
Source0: ftp://astrax.fis.ucm.es/pub/software/proas/%{name}-%{version}.tar.gz
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: pgplot-devel gcc-gfortran
%description
@@ -19,22 +18,21 @@
%setup -q
%build
-%configure
+%configure FFLAGS="${FFLAGS} -fbackslash"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc COPYING README manual.ps
%{_bindir}/*
%changelog
+* Wed Oct 10 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-2
+- Enable -fbackslash (fixes bz #2517)
+
* Thu Mar 22 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-1
- New upstream source
11 years, 6 months
rpms/proas/F-18 proas.spec,1.3,1.4
by Sergio Pascual
Author: sergiopr
Update of /cvs/nonfree/rpms/proas/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5167
Modified Files:
proas.spec
Log Message:
* Wed Oct 10 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-2
- Enable -fbackslash (fixes bz #2517)
Index: proas.spec
===================================================================
RCS file: /cvs/nonfree/rpms/proas/F-18/proas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proas.spec 22 Mar 2012 18:20:00 -0000 1.3
+++ proas.spec 10 Oct 2012 13:52:03 -0000 1.4
@@ -1,12 +1,11 @@
Summary: Planning of astronomical observations
Name: proas
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Applications/Engineering
URL: https://guaix.fis.ucm.es/projects/proas/wiki
Source0: ftp://astrax.fis.ucm.es/pub/software/proas/%{name}-%{version}.tar.gz
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: pgplot-devel gcc-gfortran
%description
@@ -19,22 +18,21 @@
%setup -q
%build
-%configure
+%configure FFLAGS="${FFLAGS} -fbackslash"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc COPYING README manual.ps
%{_bindir}/*
%changelog
+* Wed Oct 10 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-2
+- Enable -fbackslash (fixes bz #2517)
+
* Thu Mar 22 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-1
- New upstream source
11 years, 6 months
rpms/thunderbird-enigmail/F-17 rhbz-855923.patch, NONE, 1.1 xulrunner-16.0-jemalloc-ppc.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 thunderbird-enigmail.spec, 1.23, 1.24 thunderbird-install-dir.patch, 1.1, 1.2 thunderbird-mozconfig, 1.9, 1.10
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv397
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-install-dir.patch thunderbird-mozconfig
Added Files:
rhbz-855923.patch xulrunner-16.0-jemalloc-ppc.patch
Log Message:
update to 1.4.5 for Thunderbird 16
rhbz-855923.patch:
Memory.cpp | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE rhbz-855923.patch ---
Index: comm-release/mozilla/js/src/gc/Memory.cpp
===================================================================
--- comm-release.orig/mozilla/js/src/gc/Memory.cpp
+++ comm-release/mozilla/js/src/gc/Memory.cpp
@@ -348,9 +348,14 @@ UnmapPages(void *p, size_t size)
bool
MarkPagesUnused(void *p, size_t size)
{
+// A workaround for Bug 746112 - endless loop on ppc64
+#if !(defined(__powerpc__))
JS_ASSERT(uintptr_t(p) % PageSize == 0);
int result = madvise(p, size, MADV_DONTNEED);
return result != -1;
+#else
+ return true;
+#endif
}
bool
xulrunner-16.0-jemalloc-ppc.patch:
jemalloc.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE xulrunner-16.0-jemalloc-ppc.patch ---
Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
===================================================================
--- a/mozilla/memory/mozjemalloc/jemalloc.c
+++ b/mozilla/memory/mozjemalloc/jemalloc.c
@@ -1089,7 +1089,9 @@ static unsigned ncpus;
* controlling the malloc behavior are defined as compile-time constants
* for best performance and cannot be altered at runtime.
*/
+#if !(defined(__powerpc__))
#define MALLOC_STATIC_SIZES 1
+#endif
#ifdef MALLOC_STATIC_SIZES
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 28 Aug 2012 06:20:10 -0000 1.20
+++ .cvsignore 10 Oct 2012 11:34:54 -0000 1.21
@@ -1,2 +1,2 @@
-enigmail-1.4.4.tar.gz
-thunderbird-15.0.source.tar.bz2
+enigmail-1.4.5.tar.gz
+thunderbird-16.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 28 Aug 2012 06:20:10 -0000 1.21
+++ sources 10 Oct 2012 11:34:55 -0000 1.22
@@ -1,2 +1,2 @@
-1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
-e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
+41af9c53181dfd0eaf5499f970e150da enigmail-1.4.5.tar.gz
+f2c4cafff4e17091d59b306b72f7230d thunderbird-16.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-enigmail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- thunderbird-enigmail.spec 28 Aug 2012 06:20:10 -0000 1.23
+++ thunderbird-enigmail.spec 10 Oct 2012 11:34:55 -0000 1.24
@@ -1,3 +1,6 @@
+# Use system nspr/nss?
+%define system_nss 1
+
%global debug_build 0
# Use system Librairies ?
@@ -7,17 +10,21 @@
%global system_sqlite 1
%endif
-%global nspr_version 4.9
+%if %{?system_nss}
+%global nspr_version 4.9.2
%global nss_version 3.13.3
+%endif
%global cairo_version 1.10.0
%global freetype_version 2.1.9
+%if %{?system_sqlite}
%global sqlite_version 3.7.10
+%endif
%global libnotify_version 0.4
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 15.0
-%global thunmax 16.0
+%global thunver 16.0
+%global thunmax 17.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -35,11 +42,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.4
+Version: 1.4.5
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -71,6 +78,9 @@
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# PPC fixes
+Patch300: xulrunner-16.0-jemalloc-ppc.patch
+Patch301: rhbz-855923.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -80,9 +90,11 @@
%endif
+%if %{?system_nss}
+BuildRequires: nss-static >= %{nss_version}
BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-static
BuildRequires: nss-devel >= %{nss_version}
+%endif
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: libpng-devel
@@ -148,6 +160,8 @@
cd ..
%patch200 -p1 -b .addons
+%patch300 -p1 -b .852698
+%patch301 -p1 -b .855923
%if %{official_branding}
# Required by Mozilla Corporation
@@ -165,6 +179,14 @@
%{__cat} %{SOURCE11} >> .mozconfig
%endif
+%if %{?system_nss}
+echo "ac_add_options --with-system-nspr" >> .mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
+
# s390(x) fails to start with jemalloc enabled
%ifarch s390 s390x
echo "ac_add_options --disable-jemalloc" >> .mozconfig
@@ -200,7 +222,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -228,8 +250,19 @@
#
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
%{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+%if %{?debug_build}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%endif
+%ifarch s390
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-g/-g1')
+%endif
+%ifarch s390 %{arm} ppc
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
@@ -276,6 +309,9 @@
#===============================================================================
%changelog
+* Tue Oct 9 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.5-1
+- Enigmail 1.4.5 for Thunderbird 16
+
* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
- Enigmail 1.4.4 for Thunderbird 15.0
thunderbird-install-dir.patch:
config/autoconf.mk.in | 2 +-
mozilla/config/baseconfig.mk | 2 +-
mozilla/js/src/config/baseconfig.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: thunderbird-install-dir.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-install-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-install-dir.patch 1 Oct 2011 06:16:00 -0000 1.1
+++ thunderbird-install-dir.patch 10 Oct 2012 11:34:55 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/config/autoconf.mk.in.old 2011-09-05 12:24:29.000000000 +0200
-+++ thunderbird-7.0/comm-beta/config/autoconf.mk.in 2011-09-12 12:21:09.304918326 +0200
-@@ -65,7 +65,7 @@ datadir = @datadir@
+diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in
+--- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir 2012-10-05 23:20:26.000000000 +0200
++++ thunderbird-16.0/comm-release/config/autoconf.mk.in 2012-10-09 12:57:24.290767832 +0200
+@@ -36,7 +36,7 @@ datadir = @datadir@
mandir = @mandir@
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -10,27 +10,28 @@
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
MOZDEPTH = $(DEPTH)/mozilla
-diff -up thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old 2011-09-05 12:38:22.000000000 +0200
-+++ thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in 2011-09-12 12:21:24.192991555 +0200
-@@ -68,7 +68,7 @@ datadir = @datadir@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-
- DIST = $(DEPTH)/dist
-diff -up thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old 2011-09-05 12:38:30.000000000 +0200
-+++ thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-09-12 12:21:37.409056596 +0200
-@@ -61,7 +61,7 @@ libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir 2012-10-05 23:27:15.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk 2012-10-09 13:01:32.269317094 +0200
+@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
+
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ DIST = $(DEPTH)/dist
+
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-10-05 23:27:30.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-09 13:02:00.885495014 +0200
+@@ -1,6 +1,6 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-17/thunderbird-mozconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird-mozconfig 5 Jun 2012 20:33:10 -0000 1.9
+++ thunderbird-mozconfig 10 Oct 2012 11:34:55 -0000 1.10
@@ -7,8 +7,6 @@
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-libvpx
11 years, 6 months
rpms/vdr-mp3/F-18 .cvsignore,1.3,1.4 sources,1.3,1.4
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-mp3/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31838
Modified Files:
.cvsignore sources
Log Message:
* Sat May 19 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.10.2-4
- reset the release tag to 1 for release update
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-18/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 19 May 2012 18:57:41 -0000 1.3
+++ .cvsignore 10 Oct 2012 11:04:05 -0000 1.4
@@ -1,2 +1 @@
-mplayer.sh-0.8.7.tar.gz
-vdr-mp3-0.10.2.tar.gz
+vdr-mp3.spec
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-mp3/F-18/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 19 May 2012 18:57:41 -0000 1.3
+++ sources 10 Oct 2012 11:04:05 -0000 1.4
@@ -1,2 +1 @@
-cc2e48d4787b7ee739a0a8bb5b8c9fb2 mplayer.sh-0.8.7.tar.gz
-66fd37827326776c223a0fdd0ad3811e vdr-mp3-0.10.2.tar.gz
+fb2984645d01fcbe75b57fca21283cc4 vdr-mp3.spec
11 years, 6 months
rpms/proas/devel proas.spec,1.3,1.4
by Sergio Pascual
Author: sergiopr
Update of /cvs/nonfree/rpms/proas/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29321
Modified Files:
proas.spec
Log Message:
* Wed Oct 10 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-2
- Enable -fbackslash (fixes bz #2517)
Index: proas.spec
===================================================================
RCS file: /cvs/nonfree/rpms/proas/devel/proas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proas.spec 22 Mar 2012 18:20:00 -0000 1.3
+++ proas.spec 10 Oct 2012 09:40:44 -0000 1.4
@@ -1,12 +1,11 @@
Summary: Planning of astronomical observations
Name: proas
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL+
Group: Applications/Engineering
URL: https://guaix.fis.ucm.es/projects/proas/wiki
Source0: ftp://astrax.fis.ucm.es/pub/software/proas/%{name}-%{version}.tar.gz
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: pgplot-devel gcc-gfortran
%description
@@ -19,22 +18,21 @@
%setup -q
%build
-%configure
+%configure FFLAGS="${FFLAGS} -fbackslash"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc COPYING README manual.ps
%{_bindir}/*
%changelog
+* Wed Oct 10 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-2
+- Enable -fbackslash (fixes bz #2517)
+
* Thu Mar 22 2012 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.2.0-1
- New upstream source
11 years, 6 months
rpms/thunderbird-enigmail/F-18 rhbz-855923.patch, NONE, 1.1 xulrunner-16.0-jemalloc-ppc.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.21, 1.22 thunderbird-enigmail.spec, 1.26, 1.27 thunderbird-install-dir.patch, 1.1, 1.2 thunderbird-mozconfig, 1.9, 1.10
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26344
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-install-dir.patch thunderbird-mozconfig
Added Files:
rhbz-855923.patch xulrunner-16.0-jemalloc-ppc.patch
Log Message:
update to 1.4.5 for Thunderbird 16
rhbz-855923.patch:
Memory.cpp | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE rhbz-855923.patch ---
Index: comm-release/mozilla/js/src/gc/Memory.cpp
===================================================================
--- comm-release.orig/mozilla/js/src/gc/Memory.cpp
+++ comm-release/mozilla/js/src/gc/Memory.cpp
@@ -348,9 +348,14 @@ UnmapPages(void *p, size_t size)
bool
MarkPagesUnused(void *p, size_t size)
{
+// A workaround for Bug 746112 - endless loop on ppc64
+#if !(defined(__powerpc__))
JS_ASSERT(uintptr_t(p) % PageSize == 0);
int result = madvise(p, size, MADV_DONTNEED);
return result != -1;
+#else
+ return true;
+#endif
}
bool
xulrunner-16.0-jemalloc-ppc.patch:
jemalloc.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE xulrunner-16.0-jemalloc-ppc.patch ---
Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
===================================================================
--- a/mozilla/memory/mozjemalloc/jemalloc.c
+++ b/mozilla/memory/mozjemalloc/jemalloc.c
@@ -1089,7 +1089,9 @@ static unsigned ncpus;
* controlling the malloc behavior are defined as compile-time constants
* for best performance and cannot be altered at runtime.
*/
+#if !(defined(__powerpc__))
#define MALLOC_STATIC_SIZES 1
+#endif
#ifdef MALLOC_STATIC_SIZES
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 27 Aug 2012 18:13:07 -0000 1.20
+++ .cvsignore 10 Oct 2012 08:10:17 -0000 1.21
@@ -1,2 +1,2 @@
-enigmail-1.4.4.tar.gz
-thunderbird-15.0.source.tar.bz2
+enigmail-1.4.5.tar.gz
+thunderbird-16.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 27 Aug 2012 18:13:08 -0000 1.21
+++ sources 10 Oct 2012 08:10:17 -0000 1.22
@@ -1,2 +1,2 @@
-1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
-e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
+41af9c53181dfd0eaf5499f970e150da enigmail-1.4.5.tar.gz
+f2c4cafff4e17091d59b306b72f7230d thunderbird-16.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/thunderbird-enigmail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- thunderbird-enigmail.spec 27 Aug 2012 18:13:08 -0000 1.26
+++ thunderbird-enigmail.spec 10 Oct 2012 08:10:17 -0000 1.27
@@ -1,3 +1,6 @@
+# Use system nspr/nss?
+%define system_nss 1
+
%global debug_build 0
# Use system Librairies ?
@@ -7,17 +10,21 @@
%global system_sqlite 1
%endif
-%global nspr_version 4.9
+%if %{?system_nss}
+%global nspr_version 4.9.2
%global nss_version 3.13.3
+%endif
%global cairo_version 1.10.0
%global freetype_version 2.1.9
+%if %{?system_sqlite}
%global sqlite_version 3.7.10
+%endif
%global libnotify_version 0.4
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 15.0
-%global thunmax 16.0
+%global thunver 16.0
+%global thunmax 17.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -35,11 +42,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.4
+Version: 1.4.5
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -71,6 +78,9 @@
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# PPC fixes
+Patch300: xulrunner-16.0-jemalloc-ppc.patch
+Patch301: rhbz-855923.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -80,9 +90,11 @@
%endif
+%if %{?system_nss}
+BuildRequires: nss-static >= %{nss_version}
BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-static
BuildRequires: nss-devel >= %{nss_version}
+%endif
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: libpng-devel
@@ -148,6 +160,8 @@
cd ..
%patch200 -p1 -b .addons
+%patch300 -p1 -b .852698
+%patch301 -p1 -b .855923
%if %{official_branding}
# Required by Mozilla Corporation
@@ -165,6 +179,14 @@
%{__cat} %{SOURCE11} >> .mozconfig
%endif
+%if %{?system_nss}
+echo "ac_add_options --with-system-nspr" >> .mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
+
# s390(x) fails to start with jemalloc enabled
%ifarch s390 s390x
echo "ac_add_options --disable-jemalloc" >> .mozconfig
@@ -200,7 +222,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -228,8 +250,19 @@
#
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
%{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+%if %{?debug_build}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%endif
+%ifarch s390
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-g/-g1')
+%endif
+%ifarch s390 %{arm} ppc
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
@@ -276,6 +309,9 @@
#===============================================================================
%changelog
+* Tue Oct 9 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.5-1
+- Enigmail 1.4.5 for Thunderbird 16
+
* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
- Enigmail 1.4.4 for Thunderbird 15.0
thunderbird-install-dir.patch:
config/autoconf.mk.in | 2 +-
mozilla/config/baseconfig.mk | 2 +-
mozilla/js/src/config/baseconfig.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: thunderbird-install-dir.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/thunderbird-install-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-install-dir.patch 1 Oct 2011 06:16:00 -0000 1.1
+++ thunderbird-install-dir.patch 10 Oct 2012 08:10:17 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/config/autoconf.mk.in.old 2011-09-05 12:24:29.000000000 +0200
-+++ thunderbird-7.0/comm-beta/config/autoconf.mk.in 2011-09-12 12:21:09.304918326 +0200
-@@ -65,7 +65,7 @@ datadir = @datadir@
+diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in
+--- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir 2012-10-05 23:20:26.000000000 +0200
++++ thunderbird-16.0/comm-release/config/autoconf.mk.in 2012-10-09 12:57:24.290767832 +0200
+@@ -36,7 +36,7 @@ datadir = @datadir@
mandir = @mandir@
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -10,27 +10,28 @@
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
MOZDEPTH = $(DEPTH)/mozilla
-diff -up thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old 2011-09-05 12:38:22.000000000 +0200
-+++ thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in 2011-09-12 12:21:24.192991555 +0200
-@@ -68,7 +68,7 @@ datadir = @datadir@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-
- DIST = $(DEPTH)/dist
-diff -up thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old 2011-09-05 12:38:30.000000000 +0200
-+++ thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-09-12 12:21:37.409056596 +0200
-@@ -61,7 +61,7 @@ libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir 2012-10-05 23:27:15.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk 2012-10-09 13:01:32.269317094 +0200
+@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
+
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ DIST = $(DEPTH)/dist
+
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-10-05 23:27:30.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-09 13:02:00.885495014 +0200
+@@ -1,6 +1,6 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-18/thunderbird-mozconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird-mozconfig 5 Jun 2012 18:14:12 -0000 1.9
+++ thunderbird-mozconfig 10 Oct 2012 08:10:17 -0000 1.10
@@ -7,8 +7,6 @@
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-libvpx
11 years, 6 months
rpms/thunderbird-enigmail/devel rhbz-855923.patch, NONE, 1.1 xulrunner-16.0-jemalloc-ppc.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.22, 1.23 thunderbird-enigmail.spec, 1.27, 1.28 thunderbird-install-dir.patch, 1.1, 1.2 thunderbird-mozconfig, 1.9, 1.10
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21005
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-install-dir.patch thunderbird-mozconfig
Added Files:
rhbz-855923.patch xulrunner-16.0-jemalloc-ppc.patch
Log Message:
update to 1.4.5 for Thunderbird 16
rhbz-855923.patch:
Memory.cpp | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE rhbz-855923.patch ---
Index: comm-release/mozilla/js/src/gc/Memory.cpp
===================================================================
--- comm-release.orig/mozilla/js/src/gc/Memory.cpp
+++ comm-release/mozilla/js/src/gc/Memory.cpp
@@ -348,9 +348,14 @@ UnmapPages(void *p, size_t size)
bool
MarkPagesUnused(void *p, size_t size)
{
+// A workaround for Bug 746112 - endless loop on ppc64
+#if !(defined(__powerpc__))
JS_ASSERT(uintptr_t(p) % PageSize == 0);
int result = madvise(p, size, MADV_DONTNEED);
return result != -1;
+#else
+ return true;
+#endif
}
bool
xulrunner-16.0-jemalloc-ppc.patch:
jemalloc.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE xulrunner-16.0-jemalloc-ppc.patch ---
Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c
===================================================================
--- a/mozilla/memory/mozjemalloc/jemalloc.c
+++ b/mozilla/memory/mozjemalloc/jemalloc.c
@@ -1089,7 +1089,9 @@ static unsigned ncpus;
* controlling the malloc behavior are defined as compile-time constants
* for best performance and cannot be altered at runtime.
*/
+#if !(defined(__powerpc__))
#define MALLOC_STATIC_SIZES 1
+#endif
#ifdef MALLOC_STATIC_SIZES
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 27 Aug 2012 18:09:46 -0000 1.21
+++ .cvsignore 10 Oct 2012 05:30:45 -0000 1.22
@@ -1,2 +1,2 @@
-enigmail-1.4.4.tar.gz
-thunderbird-15.0.source.tar.bz2
+enigmail-1.4.5.tar.gz
+thunderbird-16.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 27 Aug 2012 18:09:46 -0000 1.22
+++ sources 10 Oct 2012 05:30:45 -0000 1.23
@@ -1,2 +1,2 @@
-1bc36b5077f6b01b6acf0f75565dddc8 enigmail-1.4.4.tar.gz
-e41f88ca2fd0c9bc608aa2c145b3bc2c thunderbird-15.0.source.tar.bz2
+41af9c53181dfd0eaf5499f970e150da enigmail-1.4.5.tar.gz
+f2c4cafff4e17091d59b306b72f7230d thunderbird-16.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- thunderbird-enigmail.spec 27 Aug 2012 18:09:46 -0000 1.27
+++ thunderbird-enigmail.spec 10 Oct 2012 05:30:45 -0000 1.28
@@ -1,3 +1,6 @@
+# Use system nspr/nss?
+%define system_nss 1
+
%global debug_build 0
# Use system Librairies ?
@@ -7,17 +10,21 @@
%global system_sqlite 1
%endif
-%global nspr_version 4.9
+%if %{?system_nss}
+%global nspr_version 4.9.2
%global nss_version 3.13.3
+%endif
%global cairo_version 1.10.0
%global freetype_version 2.1.9
+%if %{?system_sqlite}
%global sqlite_version 3.7.10
+%endif
%global libnotify_version 0.4
%global libvpx_version 1.0.0
%global _default_patch_fuzz 2
-%global thunver 15.0
-%global thunmax 16.0
+%global thunver 16.0
+%global thunmax 17.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -35,11 +42,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.4.4
+Version: 1.4.5
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -71,6 +78,9 @@
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
+# PPC fixes
+Patch300: xulrunner-16.0-jemalloc-ppc.patch
+Patch301: rhbz-855923.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -80,9 +90,11 @@
%endif
+%if %{?system_nss}
+BuildRequires: nss-static >= %{nss_version}
BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-static
BuildRequires: nss-devel >= %{nss_version}
+%endif
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libnotify-devel >= %{libnotify_version}
BuildRequires: libpng-devel
@@ -148,6 +160,8 @@
cd ..
%patch200 -p1 -b .addons
+%patch300 -p1 -b .852698
+%patch301 -p1 -b .855923
%if %{official_branding}
# Required by Mozilla Corporation
@@ -165,6 +179,14 @@
%{__cat} %{SOURCE11} >> .mozconfig
%endif
+%if %{?system_nss}
+echo "ac_add_options --with-system-nspr" >> .mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
+
# s390(x) fails to start with jemalloc enabled
%ifarch s390 s390x
echo "ac_add_options --disable-jemalloc" >> .mozconfig
@@ -200,7 +222,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-# sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
+sed -i -e '/em:version/s/1.5a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -228,8 +250,19 @@
#
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
%{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+%if %{?debug_build}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
+%endif
+%ifarch s390
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-g/-g1')
+%endif
+%ifarch s390 %{arm} ppc
+MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+%endif
+
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
@@ -276,6 +309,9 @@
#===============================================================================
%changelog
+* Tue Oct 9 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.5-1
+- Enigmail 1.4.5 for Thunderbird 16
+
* Mon Aug 27 2012 Remi Collet <remi(a)fedoraproject.org> 1.4.4-2
- Enigmail 1.4.4 for Thunderbird 15.0
thunderbird-install-dir.patch:
config/autoconf.mk.in | 2 +-
mozilla/config/baseconfig.mk | 2 +-
mozilla/js/src/config/baseconfig.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: thunderbird-install-dir.patch
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-install-dir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thunderbird-install-dir.patch 1 Oct 2011 06:16:00 -0000 1.1
+++ thunderbird-install-dir.patch 10 Oct 2012 05:30:45 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/config/autoconf.mk.in.old 2011-09-05 12:24:29.000000000 +0200
-+++ thunderbird-7.0/comm-beta/config/autoconf.mk.in 2011-09-12 12:21:09.304918326 +0200
-@@ -65,7 +65,7 @@ datadir = @datadir@
+diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in
+--- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir 2012-10-05 23:20:26.000000000 +0200
++++ thunderbird-16.0/comm-release/config/autoconf.mk.in 2012-10-09 12:57:24.290767832 +0200
+@@ -36,7 +36,7 @@ datadir = @datadir@
mandir = @mandir@
idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -10,27 +10,28 @@
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
MOZDEPTH = $(DEPTH)/mozilla
-diff -up thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old 2011-09-05 12:38:22.000000000 +0200
-+++ thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in 2011-09-12 12:21:24.192991555 +0200
-@@ -68,7 +68,7 @@ datadir = @datadir@
- mandir = @mandir@
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-
- DIST = $(DEPTH)/dist
-diff -up thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in
---- thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old 2011-09-05 12:38:30.000000000 +0200
-+++ thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-09-12 12:21:37.409056596 +0200
-@@ -61,7 +61,7 @@ libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir 2012-10-05 23:27:15.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk 2012-10-09 13:01:32.269317094 +0200
+@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
+
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ DIST = $(DEPTH)/dist
+
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in
+diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk
+--- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-10-05 23:27:30.000000000 +0200
++++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-09 13:02:00.885495014 +0200
+@@ -1,6 +1,6 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- TOP_DIST = @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thunderbird-mozconfig 5 Jun 2012 18:14:12 -0000 1.9
+++ thunderbird-mozconfig 10 Oct 2012 05:30:45 -0000 1.10
@@ -7,8 +7,6 @@
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-libvpx
11 years, 6 months
rpms/xorg-x11-drv-catalyst/F-18 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 xorg-x11-drv-catalyst.spec, 1.5, 1.6
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26537
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta
- Update to Catalyst 12.9 beta (internal version 9.00)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 16 Nov 2011 22:47:05 -0000 1.5
+++ .cvsignore 9 Oct 2012 06:51:21 -0000 1.6
@@ -1,2 +1,3 @@
xvba-sdk-0.74-404001.tar.gz
ati-driver-installer-11-11-x86.x86_64.run
+amd-driver-installer-12-9-beta-x86.x86_64.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Nov 2011 22:47:05 -0000 1.4
+++ sources 9 Oct 2012 06:51:21 -0000 1.5
@@ -1,2 +1,2 @@
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
-7196077aacfbaf7234a705f5352a1111 ati-driver-installer-11-11-x86.x86_64.run
+531c6a030078521b595815cfc19643f5 amd-driver-installer-12-9-beta-x86.x86_64.zip
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-catalyst.spec 16 Nov 2011 23:27:03 -0000 1.5
+++ xorg-x11-drv-catalyst.spec 9 Oct 2012 06:51:21 -0000 1.6
@@ -1,16 +1,16 @@
-%define atilibdir %{_libdir}/catalyst
+%global atilibdir %{_libdir}/catalyst
+%global amdrun amd-driver-installer-12-9-beta-x86.x86_64.run
+%global debug_package %{nil}
-%global debug_package %{nil}
-
-%global __strip /bin/true
+%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 11.11
-Release: 3%{?dist}
+Version: 12.9
+Release: 0.1.beta%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_6...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -109,8 +109,10 @@
%prep
%setup -q -c -T
+# Unzip fglrx driver
+unzip %{SOURCE0}
# Extract fglrx driver
-sh %{SOURCE0} --extract fglrx
+sh %{amdrun} --extract fglrx
# Extract XvBA devel files
mkdir amdxvba
@@ -228,6 +230,10 @@
rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibGL
rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibglx
+# ATI says this is a 64-bit binary, but it's not.
+rm -rf $RPM_BUILD_ROOT%{atilibdir}/libSlotMaximizerBe.so
+
+
# Remove some 'fglrx-' prefixes
mv $RPM_BUILD_ROOT%{atilibdir}/{fglrx-,}libGL.so.1.2
mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
@@ -339,6 +345,7 @@
%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
%{_sysconfdir}/ati/atiogl.xml
+%{_sysconfdir}/ati/atiapfxx.blb
%{_sysconfdir}/ati/logo.xbm.example
%{_sysconfdir}/ati/logo_mask.xbm.example
%{_sysconfdir}/ati/amdpcsdb.default
@@ -390,6 +397,27 @@
%changelog
+* Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta
+- Update to Catalyst 12.9 beta (internal version 9.00)
+
+* Fri Aug 17 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.8-1
+- Update to Catalyst 12.8 release (internal version 8.982)
+
+* Sat Jun 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 release (internal version 8.98)
+
+* Sun Jun 24 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-0.1
+- Update to Catalyst 12.6 beta (internal version 8.98)
+
+* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
+- Update to Catalyst 12.4 (internal version 8.961)
+
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
+- Update to Catalyst 12.3 (internal version 8.951)
+
+* Sun Feb 05 2012 Stewart Adam <s.adam at diffingo.com> - 12.1-1
+- Update to Catalyst 12.1 (internal version 8.93)
+
* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-3
- Bump because of rawhide tagging issue
11 years, 6 months
rpms/catalyst-kmod/F-18 .cvsignore, 1.6, 1.7 catalyst-kmod.spec, 1.14, 1.15 sources, 1.5, 1.6
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26395
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta
- Update to Catalyst 12.9 beta (internal version 9.00)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 16 Nov 2011 22:56:44 -0000 1.6
+++ .cvsignore 9 Oct 2012 06:50:18 -0000 1.7
@@ -1 +1 @@
-catalyst-kmod-data-11.11.tar.bz2
+catalyst-kmod-data-12.9.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/catalyst-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- catalyst-kmod.spec 8 Feb 2012 23:15:59 -0000 1.14
+++ catalyst-kmod.spec 9 Oct 2012 06:50:18 -0000 1.15
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels akmod
+%define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 11.11
-Release: 1%{?dist}.1
+Version: 12.9
+Release: 0.1.beta%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -77,7 +77,7 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
- make CC="gcc" PAGE_ATTR_FIX=0 \
+ make V=1 CC="gcc" PAGE_ATTR_FIX=0 \
KVER="${kernel_version%%___*}" \
KDIR="/usr/src/kernels/${kernel_version%%___*}"
popd
@@ -97,6 +97,9 @@
%changelog
+* Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta
+- Update to Catalyst 12.9 beta (internal version 9.00)
+
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-1.1
- Rebuild for UsrMove
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-18/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Nov 2011 22:56:44 -0000 1.5
+++ sources 9 Oct 2012 06:50:18 -0000 1.6
@@ -1 +1 @@
-19be5cd21a0ba3921676e4d00adf18eb catalyst-kmod-data-11.11.tar.bz2
+37e3e4494a9f83833a9ff3eb997433f1 catalyst-kmod-data-12.9.tar.bz2
11 years, 6 months
rpms/openafs/devel afs.conf.systemd, NONE, 1.1 openafs-1.6.1-systemd-env-vars.patch, NONE, 1.1 openafs-1.6.1-systemd-execpoststart.patch, NONE, 1.1 openafs-1.6.1-systemd-fhs.patch, NONE, 1.1 openafs-1.6.1-systemd-kmod-name.patch, NONE, 1.1 openafs-1.6.1-systemd-no-cellservdb.patch, NONE, 1.1 sysnames, NONE, 1.1 openafs.spec, 1.28, 1.29
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25089
Modified Files:
openafs.spec
Added Files:
afs.conf.systemd openafs-1.6.1-systemd-env-vars.patch
openafs-1.6.1-systemd-execpoststart.patch
openafs-1.6.1-systemd-fhs.patch
openafs-1.6.1-systemd-kmod-name.patch
openafs-1.6.1-systemd-no-cellservdb.patch sysnames
Log Message:
* Mon Oct 8 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-6
- Enable systemd unit files for F18 and above
--- NEW FILE afs.conf.systemd ---
# Use this file to pass additional options to the afsd and bosserver
# executables.
# Systemd will pass $AFSD_ARGS to afsd.
# You may want to add more settings below.
AFSD_ARGS="-nosettime -afsdb -dynroot"
# Memory cache or disk cache?
CACHE="-memcache"
#CACHE="-cachedir /var/cache/openafs"
# Fine-tuned AFS client configuration options:
# Large:
#OPTIONS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
# Medium:
#OPTIONS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
# Small:
#OPTIONS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
# Directory to use for configuration information:
CONFDIR="-confdir /etc/openafs"
# AFS server initialization
#BOSSERVER_ARGS=
openafs-1.6.1-systemd-env-vars.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-env-vars.patch ---
>From 1e9b8058d1da1ebde09cd280cf441a4af56e254a Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:59:43 -0600
Subject: [PATCH 4/5] systemd: add more environment variables to
openafs-client.service
At the risk of deviating too far from upstream, this permits a few more
user-friendly environment variables in /etc/sysconfig/openafs.
Change-Id: Ib0938b2865005fc1f1b1c49dfda0d4bf92957004
---
src/packaging/RedHat/openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 89a344f..719aed77 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -6,7 +6,7 @@ After=syslog.target network.target
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
-ExecStart=/usr/sbin/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.7.11.7
openafs-1.6.1-systemd-execpoststart.patch:
openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openafs-1.6.1-systemd-execpoststart.patch ---
>From a105ddc4136df2b0d8f6b143a5e46d353a5ea128 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 21:01:52 -0600
Subject: [PATCH 5/5] systemd: run "sysnames" script after starting afsd
This helper script will set any custom sysnames on the client.
Change-Id: Ibdb770fac20eb26b137bd02a71a52e0c801b039d
---
src/packaging/RedHat/openafs-client.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 719aed77..aac1ca7 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -7,6 +7,7 @@ Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR
+ExecStartPost=/usr/libexec/openafs/sysnames
ExecStop=/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
--
1.7.11.7
openafs-1.6.1-systemd-fhs.patch:
openafs-client.service | 4 ++--
openafs-server.service | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-fhs.patch ---
>From 5c440cbf1c57bb22e7ebbeaf164f52e68377252f Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:58:13 -0600
Subject: [PATCH 3/5] systemd: use FHS-style paths
The unit files from openafs.org still refer to the old transarc paths.
Replace them with FHS-compliant paths.
Change-Id: Iff326d082a00e3632ff7a8c9983fbf277ce6b4eb
---
src/packaging/RedHat/openafs-client.service | 4 ++--
src/packaging/RedHat/openafs-server.service | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index a5fb287..89a344f 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -6,9 +6,9 @@ After=syslog.target network.target
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
ExecStartPre=/sbin/modprobe openafs
-ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
+ExecStart=/usr/sbin/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
-ExecStop=/usr/vice/etc/afsd -shutdown
+ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
KillMode=none
diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service
index 2d34bb0..6f6a26f 100644
--- a/src/packaging/RedHat/openafs-server.service
+++ b/src/packaging/RedHat/openafs-server.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
[Service]
EnvironmentFile=-/etc/sysconfig/openafs
-ExecStart=/usr/afs/bin/bosserver $BOSSERVER_ARGS
+ExecStart=/usr/bin/bosserver $BOSSERVER_ARGS
ExecStop=/usr/bin/bos shutdown localhost -wait -localauth
[Install]
--
1.7.11.7
openafs-1.6.1-systemd-kmod-name.patch:
openafs-client.service | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-kmod-name.patch ---
>From 1c4448380cae1da4302ec8b74bb74945b692aa70 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:55:50 -0600
Subject: [PATCH 2/5] systemd: unload module "libafs"
Load the module as "openafs", but unload it using the name "libafs".
Change-Id: Ib7d3d9b80ff58e9cded9a3171a5b003f1995a5b7
---
src/packaging/RedHat/openafs-client.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 2ee652a..a5fb287 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -9,7 +9,7 @@ ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
ExecStop=/usr/vice/etc/afsd -shutdown
-ExecStop=/sbin/rmmod openafs
+ExecStop=/sbin/rmmod libafs
KillMode=none
[Install]
--
1.7.11.7
openafs-1.6.1-systemd-no-cellservdb.patch:
openafs-client.service | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE openafs-1.6.1-systemd-no-cellservdb.patch ---
>From 9ed4e76885f2a315586bf32b3106de86c32c5daa Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon, 8 Oct 2012 20:55:12 -0600
Subject: [PATCH 1/5] systemd: skip CellServDB manipulation
Change-Id: I23544f183c0423b208b6465c8d7184d64b6b4a15
---
src/packaging/RedHat/openafs-client.service | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
index 936762e..2ee652a 100644
--- a/src/packaging/RedHat/openafs-client.service
+++ b/src/packaging/RedHat/openafs-client.service
@@ -5,8 +5,6 @@ After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=/etc/sysconfig/openafs
-ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist
-ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB
ExecStartPre=/sbin/modprobe openafs
ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
ExecStop=/bin/umount /afs
--
1.7.11.7
--- NEW FILE sysnames ---
#!/bin/bash
# /usr/libexec/openafs/sysnames
# Set custom sysnames after starting the afsd service.
# Runs as "ExecStartPost" in openafs-client.service.
# Figure out what we are
_ARCH=`uname -i | sed 's/x86_64/amd64/'`
_KERN=`uname -r | sed 's/\([0-9]\+\)\.\([0-9]\+\)\..*/\1\2/'`
_DIST=""
for d in fedora centos redhat ; do
if [ -f "/etc/$d-release" ] ; then
_DIST=$d
break
fi
done
# What version of the distribution are we? Cut off the Client|Server
# mess from RHEL
_REL=`/bin/rpm -qf --qf '%{version}\n' /etc/${_DIST}-release | sed 's/\([0-9]\+\)[a-zA-Z]\+/\1/'`
# Sysname list. The order here is from specific to general, with a
# fallback to the compiled-in value from /usr/bin/sys. This will be
# used as the sysname search path.
SYSNAMELIST="${_ARCH}_${_DIST}_${_REL} ${_ARCH}_linux${_KERN} $(/usr/bin/sys)"
# Set the sysname
if [ -n "$SYSNAMELIST" ] ; then
_FLAG=0
_CMD=""
for SYSNAME in $SYSNAMELIST ; do
if [ $_FLAG == "1" ] ; then
_CMD="$_CMD -newsys $SYSNAME"
else
_FLAG=1
_CMD="/usr/bin/fs sysname $SYSNAME"
fi
done
fi
$_CMD > /dev/null
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openafs.spec 24 Aug 2012 16:57:08 -0000 1.28
+++ openafs.spec 9 Oct 2012 06:01:35 -0000 1.29
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -23,6 +23,10 @@
Source12: cacheinfo
Source13: openafs.init
Source14: afs.conf
+# Similar to afs.conf, but for systemd.
+Source15: afs.conf.systemd
+# Sysnames helper script
+Source16: sysnames
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
@@ -34,6 +38,22 @@
# Upstream patch to compile with newer glibc
# (not yet on openafs-stable-1_6_x; cherry-picked from master)
Patch2: openafs-1.6.1-afsd-sys-resource-h.patch
+# systemd: Skip CellServDB manipulation
+Patch3: openafs-1.6.1-systemd-no-cellservdb.patch
+# systemd: unload the proper kernel module
+# (TODO: check if this can be upstreamed)
+Patch4: openafs-1.6.1-systemd-kmod-name.patch
+# systemd: use FHS-style paths instead of transarc paths
+Patch5: openafs-1.6.1-systemd-fhs.patch
+# systemd: add additional user-friendly environment vars
+Patch6: openafs-1.6.1-systemd-env-vars.patch
+# Add ExecPostStart "sysnames" helper script.
+Patch7: openafs-1.6.1-systemd-execpoststart.patch
+
+# Use systemd unit files on Fedora 18 and above.
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+ %global _with_systemd 1
+%endif
%description
@@ -49,7 +69,14 @@
%package client
Summary: OpenAFS Filesystem client
Group: System Environment/Daemons
-Requires(post): bash, coreutils, chkconfig, selinux-policy-targeted
+Requires(post): bash, coreutils, selinux-policy-targeted
+%if 0%{?_with_systemd}
+Requires(preun): systemd
+Requires(postun): systemd
+Requires(post): systemd
+%else
+Requires(post): chkconfig
+%endif
Requires: %{name}-kmod >= %{version}
Requires: openafs = %{version}
Provides: %{name}-kmod-common = %{version}
@@ -86,6 +113,11 @@
Summary: OpenAFS Filesystem Server
Group: System Environment/Daemons
Requires: openafs-client = %{version}, openafs = %{version}
+%if 0%{?_with_systemd}
+Requires(preun): systemd
+Requires(postun): systemd
+Requires(post): systemd
+%endif
%description server
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -109,6 +141,13 @@
# This allows us to build with newer glibc
%patch2 -p1
+# systemd unit file changes for RPM Fusion
+%patch3 -p1 -b .cellservdb
+%patch4 -p1 -b .kmod
+%patch5 -p1 -b .fhs
+%patch6 -p1 -b .envvars
+%patch7 -p1 -b .execpoststart
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -156,13 +195,32 @@
install -p -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
echo %{thiscell} > ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/ThisCell
-# install the init script
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+# install the init file(s)
+%if 0%{?_with_systemd}
+ # install systemd service files
+ mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
+ pushd src/packaging/RedHat
+ install -p -m 644 openafs-client.service \
+ ${RPM_BUILD_ROOT}%{_unitdir}/openafs-client.service
+ install -p -m 644 openafs-server.service \
+ ${RPM_BUILD_ROOT}%{_unitdir}/openafs-server.service
+ popd
+ # install "sysnames" helper script
+ install -p -m 755 %{SOURCE16} \
+ ${RPM_BUILD_ROOT}%{_libexecdir}/openafs/sysnames
+%else
+ # install legacy SysV init script
+ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
+ install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+%endif
# sysconfig file
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+%if 0%{?_with_systemd}
+ install -m 644 %{SOURCE15} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+%else
+ install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+%endif
# Include the vlclient binary
install -m 755 src/vlserver/vlclient ${RPM_BUILD_ROOT}/usr/sbin/vlclient
@@ -210,11 +268,18 @@
# don't restart in post because kernel modules could well have changed
%post
/sbin/ldconfig
-if [ $1 = 1 ]; then
+%if 0%{?_with_systemd}
+ # systemd unit files are in the -client and -server subpackages.
+%else
+ if [ $1 = 1 ]; then
/sbin/chkconfig --add openafs
-fi
+ fi
+%endif
%post client
+%if !0%{?_with_systemd}
+ %systemd_post openafs-client.service
+%endif
# if this is owned by the package, upgrades with afs running can't work
if [ ! -d /afs ] ; then
mkdir -m 700 /afs
@@ -222,15 +287,44 @@
fi
exit 0
+%post server
+%if !0%{?_with_systemd}
+ %systemd_post openafs-server.service
+%endif
+
%preun
-if [ "$1" = 0 ] ; then
+%if 0%{?_with_systemd}
+ # systemd unit files are in the -client and -server subpackages.
+%else
+ if [ "$1" = 0 ] ; then
/sbin/chkconfig --del openafs
%{_sysconfdir}/rc.d/init.d/openafs stop && rmdir /afs
-fi
-exit 0
+ fi
+ exit 0
+%endif
+
+%preun client
+%if 0%{?_with_systemd}
+ %systemd_preun openafs-client.service
+%endif
+
+%preun server
+%if 0%{?_with_systemd}
+ %systemd_preun openafs-server.service
+%endif
%postun -p /sbin/ldconfig
+%postun client
+%if 0%{?_with_systemd}
+ %systemd_postun openafs-client.service
+%endif
+
+%postun server
+%if 0%{?_with_systemd}
+ %systemd_postun openafs-server.service
+%endif
+
%post devel -p /sbin/ldconfig
%postun devel -p /sbin/ldconfig
@@ -240,10 +334,16 @@
%files
%defattr(-, root, root, -)
+%dir %{_sysconfdir}/openafs
+%dir %{_libexecdir}/openafs
%doc src/LICENSE README NEWS README.DEVEL README.GIT README.PTHREADED_UBIK
%doc README.WARNINGS README-WINDOWS
%config(noreplace) %{_sysconfdir}/sysconfig/*
+%if 0%{?_with_systemd}
+# systemd files are in -client and -server subpackages
+%else
%{_sysconfdir}/rc.d/init.d/*
+%endif
%{_bindir}/aklog
%{_bindir}/bos
%{_bindir}/fs
@@ -281,11 +381,14 @@
%files client
%defattr(-, root, root)
-%dir %{_sysconfdir}/openafs
%dir %{_localstatedir}/cache/openafs
%config(noreplace) %{_sysconfdir}/openafs/CellServDB
%config(noreplace) %{_sysconfdir}/openafs/ThisCell
%config(noreplace) %{_sysconfdir}/openafs/cacheinfo
+%if 0%{?_with_systemd}
+%{_unitdir}/openafs-client.service
+%{_libexecdir}/openafs/sysnames
+%endif
%{_bindir}/afsio
%{_bindir}/cmdebug
%{_bindir}/xstat_cm_test
@@ -293,12 +396,27 @@
%files server
%defattr(-,root,root)
+%if 0%{?_with_systemd}
+%{_unitdir}/openafs-server.service
+%endif
%{_bindir}/afsmonitor
%{_bindir}/asetkey
%{_bindir}/scout
%{_bindir}/udebug
%{_bindir}/xstat_fs_test
-%{_libexecdir}/openafs
+%{_libexecdir}/openafs/buserver
+%{_libexecdir}/openafs/dafileserver
+%{_libexecdir}/openafs/dasalvager
+%{_libexecdir}/openafs/davolserver
+%{_libexecdir}/openafs/fileserver
+%{_libexecdir}/openafs/kaserver
+%{_libexecdir}/openafs/ptserver
+%{_libexecdir}/openafs/salvager
+%{_libexecdir}/openafs/salvageserver
+%{_libexecdir}/openafs/upclient
+%{_libexecdir}/openafs/upserver
+%{_libexecdir}/openafs/vlserver
+%{_libexecdir}/openafs/volserver
%{_sbindir}/dafssync-debug
%{_sbindir}/fssync-debug
%{_sbindir}/salvsync-debug
@@ -337,6 +455,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Mon Oct 8 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-6
+- Enable systemd unit files for F18 and above
+
* Thu Aug 23 2012 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.1-5
- Update /etc/sysconfig/openafs to have some more current
default settings.
11 years, 6 months