ivanromanov pushed to librcc (epel7). "Merge branch 'master' into el6 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 21 10:46:02 UTC 2015
From 8eaeabb077f658185fe6ab122cd48f5ee424476e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Sat, 3 Aug 2013 01:50:58 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/librcc.spec b/librcc.spec
index bbdc3ae..6925f41 100644
--- a/librcc.spec
+++ b/librcc.spec
@@ -1,6 +1,6 @@
Name: librcc
Version: 0.2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: RusXMMS Charset Conversion Library
License: LGPLv2+
@@ -140,6 +140,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_libdir}/librccgtk3.so
%changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Wed Jan 30 2013 Ivan Romanov <drizt at land.ru> - 0.2.10-1
- updated to 0.2.10
- dropped patches (applied by upstream)
--
cgit v0.10.2
From 2e2bb3966e5055f1e642b76e6a6273114228bd3e Mon Sep 17 00:00:00 2001
From: Ivan Romanov <drizt at land.ru>
Date: Mon, 18 Nov 2013 22:02:17 +0600
Subject: updated to 0.2.12
added libguess and librcd for greater autodetection accuracy
use %%make_install macros
new source tarball url
Also dropped unused patches (applied by upstream)
diff --git a/.gitignore b/.gitignore
index 9af9f17..129bc86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/librcc-0.2.9.tar.bz2
/librcc-0.2.10.tar.bz2
+/librcc-0.2.12.tar.bz2
diff --git a/librcc-glib2-2.32.0.patch b/librcc-glib2-2.32.0.patch
deleted file mode 100644
index dc9e917..0000000
--- a/librcc-glib2-2.32.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git librcc/external/rccexternal.c librcc.new/external/rccexternal.c
-index 2437cd4..cc54430 100644
---- librcc/external/rccexternal.c
-+++ librcc.new/external/rccexternal.c
-@@ -56,7 +56,7 @@
- # include <signal.h>
- #endif /* HAVE_SIGNAL_H */
-
--#include <glib/gthread.h>
-+#include <glib.h>
-
- #include "../src/rcchome.h"
- #include "../src/rccexternal.h"
diff --git a/librcc-rccstring.patch b/librcc-rccstring.patch
deleted file mode 100644
index 55bb2d5..0000000
--- a/librcc-rccstring.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/rccstring.c b/src/rccstring.c
-index 34fc831..eee2ac2 100644
---- a/src/rccstring.c
-+++ b/src/rccstring.c
-@@ -64,7 +64,7 @@ int rccStringFixID(rcc_string string, rcc_context ctx) {
- header = (rcc_string_header*)string;
-
-
-- memcpy(lang, header->language, 2); lang[3] = 0;
-+ memcpy(lang, header->language, 2); lang[2] = 0;
- curlang = rccGetLanguageName(ctx, header->language_id);
- if ((curlang)&&(!strcasecmp(lang, curlang))) return 0;
-
diff --git a/librcc.spec b/librcc.spec
index 6925f41..0dd47d3 100644
--- a/librcc.spec
+++ b/librcc.spec
@@ -1,12 +1,12 @@
Name: librcc
-Version: 0.2.10
-Release: 2%{?dist}
+Version: 0.2.12
+Release: 1%{?dist}
Summary: RusXMMS Charset Conversion Library
License: LGPLv2+
URL: http://rusxmms.sourceforge.net
Group: System Environment/Libraries
-Source0: http://downloads.sourceforge.net/rusxmms/%{name}-%{version}.tar.bz2
+Source0: http://dside.dyndns.org/files/rusxmms/%{name}-%{version}.tar.bz2
BuildRequires: libxml2-devel
BuildRequires: enca-devel
@@ -14,6 +14,8 @@ BuildRequires: gtk+-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: aspell-devel
+BuildRequires: libguess-devel
+BuildRequires: librcd-devel
%description
The Abilities of LibRCC Library
@@ -93,7 +95,7 @@ make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
find $RPM_BUILD_ROOT -name '*.la' -delete
@@ -140,6 +142,12 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_libdir}/librccgtk3.so
%changelog
+* Mon Nov 18 2013 Ivan Romanov <drizt at land.ru> - 0.2.12-1
+- updated to 0.2.12
+- added libguess and librcd for greater autodetection accuracy
+- use %%make_install macros
+- new source tarball url
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index e594ff4..d58a19d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-077260cf58ae9624c964652b79fbb5fb librcc-0.2.10.tar.bz2
+930de6cd64e5daa33cabed58261634bb librcc-0.2.12.tar.bz2
--
cgit v0.10.2
From aafa25860b2f7ea13c4ead815fefbe85d3ba61cd Mon Sep 17 00:00:00 2001
From: Ivan Romanov <drizt at land.ru>
Date: Tue, 19 Nov 2013 13:45:33 +0600
Subject: do not buil gtk3 libs and libguess support for RHEL
diff --git a/librcc.spec b/librcc.spec
index 0dd47d3..5c425a4 100644
--- a/librcc.spec
+++ b/librcc.spec
@@ -1,6 +1,6 @@
Name: librcc
Version: 0.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: RusXMMS Charset Conversion Library
License: LGPLv2+
@@ -12,9 +12,12 @@ BuildRequires: libxml2-devel
BuildRequires: enca-devel
BuildRequires: gtk+-devel
BuildRequires: gtk2-devel
+# RHEL has no gtk3 and libguess
+%if 0%{?fedora}
BuildRequires: gtk3-devel
-BuildRequires: aspell-devel
BuildRequires: libguess-devel
+%endif
+BuildRequires: aspell-devel
BuildRequires: librcd-devel
%description
@@ -55,6 +58,7 @@ Group: System Environment/Libraries
The %{name}-gtk2 package contains GTK2 bindings for RusXMMS Encoding
Conversion Library
+%if 0%{?fedora}
%package gtk3
Summary: RusXMMS Encoding Conversion Library GTK3 bindings
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -63,13 +67,16 @@ Group: System Environment/Libraries
%description gtk3
The %{name}-gtk3 package contains GTK3 bindings for RusXMMS Encoding
Conversion Library
+%endif
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-gtk+%{?_isa} = %{version}-%{release}
Requires: %{name}-gtk2%{?_isa} = %{version}-%{release}
+%if 0%{?fedora}
Requires: %{name}-gtk3%{?_isa} = %{version}-%{release}
+%endif
Group: Development/Libraries
%description devel
@@ -111,9 +118,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%postun gtk2 -p /sbin/ldconfig
+%if 0%{?fedora}
%post gtk3 -p /sbin/ldconfig
%postun gtk3 -p /sbin/ldconfig
+%endif
%files
%doc COPYING NEWS AUTHORS README
@@ -128,8 +137,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%files gtk2
%{_libdir}/librccgtk2.so.*
+%if 0%{?fedora}
%files gtk3
%{_libdir}/librccgtk3.so.*
+%endif
%files devel
%doc examples
@@ -139,9 +150,15 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_libdir}/librccui.so
%{_libdir}/librccgtk.so
%{_libdir}/librccgtk2.so
+%if 0%{?fedora}
%{_libdir}/librccgtk3.so
+%endif
%changelog
+* Tue Nov 19 2013 Ivan Romanov <drizt at land.ru> - 0.2.12-2
+- do not buil gtk3 libs for RHEL
+- no libguess support for RHEL
+
* Mon Nov 18 2013 Ivan Romanov <drizt at land.ru> - 0.2.12-1
- updated to 0.2.12
- added libguess and librcd for greater autodetection accuracy
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/librcc.git/commit/?h=epel7&id=376247b6bedf29327a7ac87da86305913518b936
More information about the scm-commits
mailing list