[cssed] Fix build with ld --no-add-needed.

Ville Skyttä scop at fedoraproject.org
Wed Aug 1 16:34:28 UTC 2012


commit 5e4b33fa6acc736bcaab2ab8562fc6c77deea016
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Aug 1 19:33:47 2012 +0300

    Fix build with ld --no-add-needed.
    
    - Fix spelling error in %description.

 cssed-0.4.0-no-add-needed.patch |   40 +++++++++++++++++++++++++++++++++++++++
 cssed.spec                      |   10 +++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)
---
diff --git a/cssed-0.4.0-no-add-needed.patch b/cssed-0.4.0-no-add-needed.patch
new file mode 100644
index 0000000..a23ae49
--- /dev/null
+++ b/cssed-0.4.0-no-add-needed.patch
@@ -0,0 +1,40 @@
+diff -up cssed-0.4.0/configure~ cssed-0.4.0/configure
+--- cssed-0.4.0/configure~	2005-09-28 12:41:40.000000000 +0300
++++ cssed-0.4.0/configure	2012-08-01 19:27:26.580399240 +0300
+@@ -6011,6 +6011,17 @@ echo "$as_me: error: gthread-2.0 not fou
+    { (exit 1); exit 1; }; }
+ fi
+ 
++echo -n "checking for gmodule-2.0... "
++if pkg-config --exists gmodule-2.0 ; then
++	echo "yes"
++pkg_modules="$pkg_modules gmodule-2.0"
++else
++	echo "no"
++	{ { echo "$as_me:$LINENO: error: gmodule-2.0 not found please install the glib2 development package" >&5
++echo "$as_me: error: gmodule-2.0 not found please install the glib2 development package" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
+ echo -n "checking for libxml-2.0 ... "
+ if pkg-config --exists libxml-2.0 ; then
+ 	echo "yes"
+diff -up cssed-0.4.0/configure.in~ cssed-0.4.0/configure.in
+--- cssed-0.4.0/configure.in~	2005-10-23 13:05:18.000000000 +0300
++++ cssed-0.4.0/configure.in	2012-08-01 19:26:24.599203358 +0300
+@@ -101,6 +101,15 @@ else
+ 	AC_MSG_ERROR(gthread-2.0 not found please install the glib2 development package)
+ fi
+ 
++echo -n "checking for gmodule-2.0... "
++if pkg-config --exists gmodule-2.0 ; then
++	echo "yes"
++pkg_modules="$pkg_modules gmodule-2.0"
++else
++	echo "no"
++	AC_MSG_ERROR(gmodule-2.0 not found please install the glib2 development package)
++fi
++
+ echo -n "checking for libxml-2.0 ... "
+ if pkg-config --exists libxml-2.0 ; then
+ 	echo "yes"
diff --git a/cssed.spec b/cssed.spec
index 30cb89b..7bad479 100644
--- a/cssed.spec
+++ b/cssed.spec
@@ -1,6 +1,6 @@
 Name:		cssed
 Version:	0.4.0
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	CSS editor and validator
 
 Group:		Applications/Editors
@@ -12,6 +12,7 @@ Patch0:		cssed-0.4.0-headersfix.patch
 Patch1:		cssed-0.4.0-gcc44.patch
 Patch2:		cssed-0.4.0_cssdialogs-functions.patch
 Patch3:		cssed-0.4.0_pixmap.patch
+Patch4:		cssed-0.4.0-no-add-needed.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libxml2-devel,gettext,gtk2-devel,desktop-file-utils
@@ -24,7 +25,7 @@ It features syntax highlighting, syntax validation, MDI notebook based
 interface, quick CSS properties and values insertion, auto-completion and
 dialog-based insertion of CSS complex values.
 
-Being a CSS editor, it's not limited to this language. cssed haved some
+Being a CSS editor, it's not limited to this language. cssed has some
 support for HTML (with embbeded Javascript), XML, Javascript, Java, PHP, JSP,
 C, C++, Apache configuration files, .htaccess, Python, Perl, SQL, SH and other
 languages so it can serve quite well as multi-purpose editor.
@@ -43,6 +44,7 @@ Development files for cssed.
 %patch1 -p0 -b .gcc44
 %patch2 -p0
 %patch3 -p0
+%patch4 -p1
 
 %{__sed} -i 's/\r//' include/{SciLexer.h,Scintilla.h,ScintillaWidget.h}
 %{__sed} -i 's/\r//' scintilla/License.txt
@@ -81,6 +83,10 @@ rm -rf %{buildroot}
 %{_includedir}/cssed
 
 %changelog
+* Wed Aug  1 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.4.0-15
+- Fix build with ld --no-add-needed.
+- Fix spelling error in %%description.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list