diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d2122e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: adime -# $Id$ -NAME := adime -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/adime-2.2.1-so-fixes.patch b/adime-2.2.1-so-fixes.patch index 948d79e..e2fcfda 100644 --- a/adime-2.2.1-so-fixes.patch +++ b/adime-2.2.1-so-fixes.patch @@ -9,19 +9,6 @@ IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) -@@ -153,7 +153,11 @@ - SFLAGS = $(WFLAGS) - ifndef SYMBOLMODE - LFLAGS += -s --LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` -+# allegro-config --libs drags in -lalleg_unshareable, which is non-PIC -+# and thus should only be in the application not a .so file. This means all -+# applications which use adime must be linked with: -+# -Wl,--export-dynamic -lalleg_unsharable (or `allegro-config --libs`) -+LIB_FLAGS= $(shell allegro-config --libs | sed 's/-lalleg_unsharable//') - endif - endif - endif @@ -236,7 +240,7 @@ LINK_LIB_DEPS = diff --git a/adime.spec b/adime.spec index e942e9a..d4916c2 100644 --- a/adime.spec +++ b/adime.spec @@ -1,14 +1,14 @@ Name: adime Version: 2.2.1 -Release: 9%{?dist} +Release: 43%{?dist} Summary: Allegro Dialogs Made Easy -Group: System Environment/Libraries License: zlib URL: http://adime.sourceforge.net/ -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: adime-2.2.1-so-fixes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gcc BuildRequires: allegro-devel texinfo +BuildRequires: make %description Adime is a portable add-on library for Allegro with functions for generating @@ -19,11 +19,8 @@ data. %package devel Summary: Development libraries and headers for adime -Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: allegro-devel -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description devel The developmental files that must be installed in order to compile @@ -32,7 +29,7 @@ applications which use adime. %prep %setup -q -%patch0 -p1 -z .so-fixes +%patch -P0 -p1 -z .so-fixes ./fix.sh unix rm docs/txt/tmpfile.txt mkdir docs/html docs/rtf @@ -46,7 +43,6 @@ make %{?_smp_mflags} lib docs \ %install -rm -rf $RPM_BUILD_ROOT make install install-man install-info \ SYSTEM_DIR=$RPM_BUILD_ROOT/usr \ SYSTEM_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \ @@ -56,39 +52,125 @@ rm $RPM_BUILD_ROOT%{_infodir}/dir ln -s libadime.so.0 $RPM_BUILD_ROOT%{_libdir}/libadime.so -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post devel -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun devel -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi - +%ldconfig_scriptlets %files -%defattr(-,root,root,-) %doc license.txt thanks.txt changes.txt %{_libdir}/libadime.so.0 %files devel -%defattr(-,root,root,-) %doc readme.txt docs/txt/*.txt docs/rtf docs/html %{_includedir}/adime.h %{_includedir}/adime %{_libdir}/libadime.so %{_mandir}/man3/* -%{_infodir}/adime.info.gz +%{_infodir}/adime.info.* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.2.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 2.2.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 2.2.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 2.2.1-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.2.1-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.2.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.2.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 2.2.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.2.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 2.2.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.2.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 2.2.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jul 31 2020 Fedora Release Engineering - 2.2.1-31 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Apr 24 2019 Björn Esser - 2.2.1-27 +- Remove hardcoded gzip suffix from GNU info pages + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.2.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 2.2.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 2.2.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 2.2.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 2.2.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Oct 14 2013 Hans de Goede - 2.2.1-16 +- Fix Source0 URL + +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 2.2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 2.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Jul 13 2011 Hans de Goede - 2.2.1-11 +- Rebuilt for new allegro-4.4 + +* Mon Feb 07 2011 Fedora Release Engineering - 2.2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 2.2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild